From ae9b105c6718dcb91b415e257acc8b8c8bf0c6c7 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 30 Nov 2010 18:46:45 +0000
Subject: Create branch for 2.0 beta2 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040693 13f79535-47bb-0310-9956-ffa450edef68
---
 .../getting-started/helloworld-webapp/README       |   7 ++
 .../getting-started/helloworld-webapp/pom.xml      | 118 +++++++++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml                |  49 +++++++++
 .../helloworld-webapp/src/main/webapp/hello.html   |  32 ++++++
 .../src/test/java/itest/Helloworld.java            |  27 +++++
 .../test/java/itest/HelloworldTestCaseFIXME.java   |  44 ++++++++
 .../src/test/resources/test-web.xml                |  30 ++++++
 7 files changed, 307 insertions(+)
 create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/README
 create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml
 create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/hello.html
 create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/Helloworld.java
 create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java
 create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml

(limited to 'sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp')

diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/README b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/README
new file mode 100644
index 0000000000..828aadb0f1
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/README
@@ -0,0 +1,7 @@
+The README in the <distribution-unpack-dir>/samples directory provides 
+general instructions about building and running samples. (where
+distribution-unpack-dir is the directory in which you unpacked the tuscany
+binary distribution archive). Take a look there first (noting at you read it that this sample
+is not a new style sample). 
+
+TODO - finish
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml
new file mode 100644
index 0000000000..e080e66122
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta2-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sample-helloworld-webapp</artifactId>
+    <name>Apache Tuscany SCA Sample Helloworld</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta2-SNAPSHOT</version>
+        </dependency>         
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld</finalName>
+       <plugins>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                   <artifactItems>
+                     <artifactItem>
+                       <groupId>org.apache.tuscany.sca</groupId>
+                       <artifactId>sample-helloworld-contribution</artifactId>
+                       <version>${pom.version}</version>
+                       <!-- should really go in the target folder but i can't get jetty:run to work using that -->
+                       <outputDirectory>src/main/webapp/WEB-INF/sca-contributions</outputDirectory>
+                     </artifactItem>
+                   </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <overrideWebXml>src/test/resources/test-web.xml</overrideWebXml>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..755162e305
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+  <display-name>Apache Tuscany Helloworld Sample</display-name>
+
+  <context-param>
+    <param-name>contributions</param-name>
+    <param-value>/WEB-INF/sca-contributions</param-value>
+  </context-param>
+
+<!-- TODO: need to sort out what to do about distributed domain
+  <context-param>
+    <param-name>org.apache.tuscany.sca.config</param-name>
+    <param-value>uri:default</param-value>
+  </context-param>
+-->
+
+  <filter>
+    <filter-name>tuscany</filter-name> 
+    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
+  </filter>
+
+  <filter-mapping>
+    <filter-name>tuscany</filter-name> 
+    <url-pattern>/*</url-pattern> 
+  </filter-mapping>
+
+</web-app>
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/hello.html b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/hello.html
new file mode 100644
index 0000000000..05038391a0
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/main/webapp/hello.html
@@ -0,0 +1,32 @@
+<!--
+ * 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.
+-->
+<html>
+
+<head>
+<title>Apache Tuscany Helloworld Servlet Sample</title>
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Servlet Sample</h2>
+
+<a href="http://localhost:8085/HelloworldWSComponent/Helloworld?wsdl">WSDL for binding.ws of the Helloworld service of the HelloWorldWS component</a>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/Helloworld.java b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/Helloworld.java
new file mode 100644
index 0000000000..f1ccf0b1ba
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/Helloworld.java
@@ -0,0 +1,27 @@
+/*
+ * 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 itest;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface Helloworld {
+    String sayHello(String name);
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java
new file mode 100644
index 0000000000..c1c2c6aae0
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java
@@ -0,0 +1,44 @@
+/*
+ * 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 itest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.URI;
+
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchDomainException;
+import org.oasisopen.sca.NoSuchServiceException;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ */
+public class HelloworldTestCaseFIXME {
+
+    @Test
+    public void testHelloworld() throws NoSuchDomainException, NoSuchServiceException {
+// TODO: need to fix the config URI so it works properly
+//        SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("uri:default?remote=127.0.0.1:54321"));
+        SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("tuscany:default?remotes=192.168.1.64"));
+        Helloworld helloworld = factory.getService(Helloworld.class, "HelloworldComponent");
+        assertEquals("Hello World", helloworld.sayHello("World"));
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml
new file mode 100644
index 0000000000..a68aa28698
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+  <context-param>
+    <param-name>org.apache.tuscany.sca.config</param-name>
+    <param-value>uri:default?bind=127.0.0.1:54321</param-value>
+  </context-param>
+
+</web-app>
-- 
cgit v1.2.3