From 5021e9e9b9680704a1dd788e057e7ad25e8a0c00 Mon Sep 17 00:00:00 2001 From: fmoga Date: Fri, 1 Oct 2010 06:15:10 +0000 Subject: Changed contribution-* samples to *-contribution. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1003399 13f79535-47bb-0310-9956-ffa450edef68 --- .../contribution-helloworld-spring/pom.xml | 67 ---------------------- .../src/main/java/sample/DateService.java | 29 ---------- .../src/main/java/sample/DateServiceImpl.java | 37 ------------ .../src/main/java/sample/Helloworld.java | 28 --------- .../src/main/java/sample/HelloworldClientImpl.java | 48 ---------------- .../src/main/java/sample/HelloworldImpl.java | 34 ----------- .../main/resources/META-INF/sca-contribution.xml | 23 -------- .../main/resources/helloworld-client-context.xml | 37 ------------ .../src/main/resources/helloworld-context.xml | 30 ---------- .../src/main/resources/helloworld.composite | 36 ------------ .../src/test/java/sample/HelloworldTestCase.java | 33 ----------- .../helloworld-spring-contribution/pom.xml | 67 ++++++++++++++++++++++ .../src/main/java/sample/DateService.java | 29 ++++++++++ .../src/main/java/sample/DateServiceImpl.java | 37 ++++++++++++ .../src/main/java/sample/Helloworld.java | 28 +++++++++ .../src/main/java/sample/HelloworldClientImpl.java | 48 ++++++++++++++++ .../src/main/java/sample/HelloworldImpl.java | 34 +++++++++++ .../main/resources/META-INF/sca-contribution.xml | 23 ++++++++ .../main/resources/helloworld-client-context.xml | 37 ++++++++++++ .../src/main/resources/helloworld-context.xml | 30 ++++++++++ .../src/main/resources/helloworld.composite | 36 ++++++++++++ .../src/test/java/sample/HelloworldTestCase.java | 33 +++++++++++ .../learning-more/implementation-spring/pom.xml | 2 +- 23 files changed, 403 insertions(+), 403 deletions(-) delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite delete mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/test/java/sample/HelloworldTestCase.java create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite create mode 100644 sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java (limited to 'sca-java-2.x/trunk/samples/learning-more/implementation-spring') diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/pom.xml deleted file mode 100644 index b8cb765c38..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../pom.xml - - - sample-helloworld-spring - Apache Tuscany SCA Sample HelloWorld using Spring - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - junit - junit - 4.8.1 - test - - - - - ${artifactId} - - - - - org.apache.tuscany.maven.plugins - maven-tuscany-plugin - 2.0-SNAPSHOT - - - org.apache.tuscany.sca.shades - tuscany-spring - 2.0-SNAPSHOT - - - - - - - diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java deleted file mode 100644 index 7c50d66a9c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java +++ /dev/null @@ -1,29 +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 sample; - -import java.util.Date; - -/** - * - */ -public interface DateService { - Date getDate(); -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java deleted file mode 100644 index 64bdd86f7c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java +++ /dev/null @@ -1,37 +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 sample; - -import java.util.Date; - -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(DateService.class) -public class DateServiceImpl implements DateService { - - public Date getDate() { - System.out.println("DateServiceImpl.getDate()"); - return new Date(); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java deleted file mode 100644 index f4e8c50448..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java +++ /dev/null @@ -1,28 +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 sample; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java deleted file mode 100644 index a01aad9d88..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.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 sample; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloworldClientImpl implements Helloworld { - private Helloworld helloworld; - - // SCA reference - @Reference(required = false) - private DateService dateService; - - public HelloworldClientImpl() { - System.out.println("HelloworldClientImpl()"); - } - - public String sayHello(String name) { - System.out.println("HelloworldClientImpl.sayHello(" + name + ")"); - if (dateService == null) { - return "Hello " + name; - } - return "[" + dateService.getDate() + "] " + helloworld.sayHello(name); - } - - // Setter for spring injection - public void setHelloworld(Helloworld helloworld) { - System.out.println("Injected with " + helloworld); - this.helloworld = helloworld; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java deleted file mode 100644 index 125c333ddc..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java +++ /dev/null @@ -1,34 +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 sample; - - -public class HelloworldImpl implements Helloworld { - - public HelloworldImpl() { - super(); - System.out.println("HelloworldImpl()"); - } - - public String sayHello(String name) { - System.out.println("HelloworldImpl.sayHello(" + name + ")"); - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 552d100638..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml deleted file mode 100644 index 0e30cfa582..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml deleted file mode 100644 index 9ecd09974e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite deleted file mode 100644 index 6d356758ae..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/test/java/sample/HelloworldTestCase.java deleted file mode 100644 index 7e679ec0e9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/test/java/sample/HelloworldTestCase.java +++ /dev/null @@ -1,33 +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 sample; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class HelloworldTestCase { - - @Test - public void testSayHello() { - HelloworldImpl helloworld = new HelloworldImpl(); - assertEquals("Hello Petra", helloworld.sayHello("Petra")); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml new file mode 100644 index 0000000000..b8cb765c38 --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../pom.xml + + + sample-helloworld-spring + Apache Tuscany SCA Sample HelloWorld using Spring + + + + org.apache.tuscany.sca + tuscany-sca-api + 2.0-SNAPSHOT + provided + + + junit + junit + 4.8.1 + test + + + + + ${artifactId} + + + + + org.apache.tuscany.maven.plugins + maven-tuscany-plugin + 2.0-SNAPSHOT + + + org.apache.tuscany.sca.shades + tuscany-spring + 2.0-SNAPSHOT + + + + + + + diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java new file mode 100644 index 0000000000..7c50d66a9c --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java @@ -0,0 +1,29 @@ +/* + * 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; + +import java.util.Date; + +/** + * + */ +public interface DateService { + Date getDate(); +} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java new file mode 100644 index 0000000000..64bdd86f7c --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java @@ -0,0 +1,37 @@ +/* + * 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; + +import java.util.Date; + +import org.oasisopen.sca.annotation.Service; + +/** + * + */ +@Service(DateService.class) +public class DateServiceImpl implements DateService { + + public Date getDate() { + System.out.println("DateServiceImpl.getDate()"); + return new Date(); + } + +} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java new file mode 100644 index 0000000000..f4e8c50448 --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.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; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface Helloworld { + + String sayHello(String name); + +} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java new file mode 100644 index 0000000000..ddcb1d9bc3 --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java @@ -0,0 +1,48 @@ +/* + * 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; + +import org.oasisopen.sca.annotation.Reference; + +public class HelloworldClientImpl implements Helloworld { + private Helloworld helloworld; + + // SCA reference + @Reference(required = false) + private DateService dateService; + + public HelloworldClientImpl() { + System.out.println("HelloworldClientImpl()"); + } + + public String sayHello(String name) { + System.out.println("HelloworldClientImpl.sayHello(" + name + ")"); + if (dateService == null) { + return "Hello " + name; + } + return "[" + dateService.getDate() + "] " + helloworld.sayHello(name); + } + + // Setter for spring injection + public void setHelloworld(Helloworld helloworld) { + System.out.println("Injected with " + helloworld); + this.helloworld = helloworld; + } + +} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java new file mode 100644 index 0000000000..125c333ddc --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java @@ -0,0 +1,34 @@ +/* + * 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; + + +public class HelloworldImpl implements Helloworld { + + public HelloworldImpl() { + super(); + System.out.println("HelloworldImpl()"); + } + + public String sayHello(String name) { + System.out.println("HelloworldImpl.sayHello(" + name + ")"); + return "Hello " + name; + } + +} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..552d100638 --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml new file mode 100644 index 0000000000..15e9647bb0 --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml new file mode 100644 index 0000000000..9ecd09974e --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..6d356758ae --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java new file mode 100644 index 0000000000..7e679ec0e9 --- /dev/null +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java @@ -0,0 +1,33 @@ +/* + * 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; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class HelloworldTestCase { + + @Test + public void testSayHello() { + HelloworldImpl helloworld = new HelloworldImpl(); + assertEquals("Hello Petra", helloworld.sayHello("Petra")); + } + +} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml index 0cc184cbb4..f3e96c70bd 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml @@ -36,7 +36,7 @@ true - contribution-helloworld-spring + helloworld-spring-contribution helloworld-spring-webapp -- cgit v1.2.3