Move Tuscany from Incubator to top level.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@668359 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 117 insertions, 0 deletions

diff --git a/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..7f06dc7ccb
--- /dev/null
+++ b/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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.    

+-->

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

+   xmlns:c="http://catalog">

+   <import.java package="services"/>
+   <deployable composite="c:catalog-web"/>

+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/WEB-INF/web.xml b/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..e08d617dad
--- /dev/null
+++ b/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<!--

+  * 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.    

+-->

+

+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

+<web-app>

+

+  <display-name>Fruit Catalog</display-name>

+  
+  <filter>
+    <filter-name>tuscany</filter-name> 
+    <filter-class>org.apache.tuscany.sca.node.launcher.NodeServletFilter</filter-class> 
+  </filter>
+
+  <filter-mapping>
+    <filter-name>tuscany</filter-name> 
+    <url-pattern>/*</url-pattern> 
+  </filter-mapping>
+
+  <welcome-file-list id="WelcomeFileList">

+    <welcome-file>catalog.jsp</welcome-file>

+  </welcome-file-list>

+

+</web-app>

diff --git a/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/catalog.jsp b/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/catalog.jsp
new file mode 100644
index 0000000000..dcee7c33f4
--- /dev/null
+++ b/branches/sca-java-1.3/tutorial/catalog-webapp/webapp/catalog.jsp
@@ -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.
+--%>

+

+<%@ page import="org.apache.tuscany.sca.node.SCAClient"%>
+<%@ page import="services.Catalog" %>
+<%@page import="services.Item"%>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%
+  
+  SCAClient client = (SCAClient) application.getAttribute("org.apache.tuscany.sca.node.SCAClient");
+   
+  Catalog catalog = (Catalog)client.getService(Catalog.class, "LocalFruitsCatalog");
+  Item[] items = catalog.get();
+  
+%>
+
+<html>
+<head><title>Catalog</title></head>
+
+<body>
+<h1>Catalog</h1>
+
+<table border="0">
+
+<% for (int i = 0, n = items.length; i < n; i++) { %>
+
+    <tr><td><%=items[i].getName() %></td><td><%=items[i].getPrice() %></td></tr>
+
+<% } %>
+
+</table>
+
+</body>
+</html>