From ef55c9dca035f81e5637c4af297ce2baafc8f060 Mon Sep 17 00:00:00 2001 From: fmoga Date: Mon, 20 Sep 2010 13:02:40 +0000 Subject: Moved some of the samples into the apropriate section. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998913 13f79535-47bb-0310-9956-ffa450edef68 --- .../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 ++++ .../helloworld-spring-webapp/pom.xml | 186 +++++++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 51 ++++++ .../test/java/sample/HelloworldClientTestCase.java | 58 +++++++ .../src/test/resources/test-web.xml | 25 +++ 15 files changed, 722 insertions(+) create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/pom.xml create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml (limited to 'sandbox/samples/sca-features/implementation-spring') diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/pom.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/pom.xml new file mode 100644 index 0000000000..b8cb765c38 --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java new file mode 100644 index 0000000000..7c50d66a9c --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java new file mode 100644 index 0000000000..64bdd86f7c --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java new file mode 100644 index 0000000000..f4e8c50448 --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java new file mode 100644 index 0000000000..ddcb1d9bc3 --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java new file mode 100644 index 0000000000..125c333ddc --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..552d100638 --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml new file mode 100644 index 0000000000..15e9647bb0 --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml new file mode 100644 index 0000000000..9ecd09974e --- /dev/null +++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..6d356758ae --- /dev/null +++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java new file mode 100644 index 0000000000..7e679ec0e9 --- /dev/null +++ b/sandbox/samples/sca-features/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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml new file mode 100644 index 0000000000..59f3a25696 --- /dev/null +++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml @@ -0,0 +1,186 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-spring-webapp + Apache Tuscany SCA Sample Spring Helloworld + war + + + + org.apache.tuscany.sca + tuscany-feature-web20 + 2.0-SNAPSHOT + pom + + + + org.apache.tuscany.sca + tuscany-implementation-spring-webapp + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-spring-runtime + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-host-webapp + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + sample-helloworld-spring + 2.0-SNAPSHOT + provided + + + + junit + junit + 4.8.1 + test + + + httpunit + httpunit + 1.6.1 + test + + + + + helloworld-spring + + + + org.apache.maven.plugins + maven-surefire-plugin + + + true + + + + + integration-test + + test + + + + true + false + + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + org.apache.tuscany.sca + sample-helloworld-spring + jar + WEB-INF/classes + + META-INF/**/* + + + + + org.apache.tuscany.sca + sample-helloworld-spring + jar + + META-INF/**/* + + + + + org.apache.tuscany.sca + tuscany-implementation-spring-webapp + jar + WEB-INF/classes + + org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml + + + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld + foo + 9999 + + + + start-jetty + pre-integration-test + + run + + + src/test/resources/test-web.xml + ${project.build.directory}/${project.build.finalName} + ${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml + ${project.build.directory}/${project.build.finalName}/WEB-INF/classes + 0 + true + + + 8085 + + + + + + stop-jetty + post-integration-test + + stop + + + + + + + + diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..49590e00a2 --- /dev/null +++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,51 @@ + + + + + Apache Tuscany Helloworld Spring Sample + + + contextConfigLocation + + /WEB-INF/classes/helloworld-context.xml + /WEB-INF/classes/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml + + + + + org.springframework.web.context.ContextLoaderListener + + + + org.apache.tuscany.sca.host.webapp.TuscanyContextListener + + + + tuscany + org.apache.tuscany.sca.host.webapp.TuscanyServletFilter + + + + tuscany + /* + + + diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java new file mode 100644 index 0000000000..fa77f08ee2 --- /dev/null +++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java @@ -0,0 +1,58 @@ +/* + * 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.io.ByteArrayInputStream; + +import junit.framework.Assert; + +import org.json.JSONObject; +import org.junit.Test; + +import com.meterware.httpunit.PostMethodWebRequest; +import com.meterware.httpunit.WebConversation; +import com.meterware.httpunit.WebRequest; +import com.meterware.httpunit.WebResponse; + + +/** + * + */ +public class HelloworldClientTestCase { + private static final String SERVICE_URL = + "http://localhost:8085/helloworld/HelloworldClientComponent/HelloworldClientBean"; + + @Test + public void testJSONRPCBinding() throws Exception { + JSONObject jsonRequest = new JSONObject("{ \"method\": \"sayHello\", \"params\": [\"Ray\"], \"id\": 1}"); + + WebConversation wc = new WebConversation(); + WebRequest request = + new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), + "application/json"); + WebResponse response = wc.getResource(request); + + Assert.assertEquals(200, response.getResponseCode()); + + JSONObject jsonResp = new JSONObject(response.getText()); + String text = jsonResp.getString("result"); + Assert.assertTrue(text.endsWith("Hello Ray")); + } +} diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml new file mode 100644 index 0000000000..ac5c134454 --- /dev/null +++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml @@ -0,0 +1,25 @@ + + + + + -- cgit v1.2.3