Author: jsdelfino
Date: Mon Mar 17 18:53:18 2008
New Revision: 638175

URL: http://svn.apache.org/viewvc?rev=638175&view=rev
Log:
Converted launcher-webapp module to an actual webapp.

Added:
    incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/
    
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/
    
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
   (with props)
    
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/
    
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
   (with props)
    
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/index.jsp
Removed:
    incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/java/org/
    
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/resources/META-INF/
Modified:
    incubator/tuscany/java/sca/modules/node2-launcher-webapp/pom.xml

Modified: incubator/tuscany/java/sca/modules/node2-launcher-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-launcher-webapp/pom.xml?rev=638175&r1=638174&r2=638175&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/node2-launcher-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/node2-launcher-webapp/pom.xml Mon Mar 17 
18:53:18 2008
@@ -28,29 +28,16 @@
     </parent>
 
     <artifactId>tuscany-node2-launcher-webapp</artifactId>
-    <name>Apache Tuscany SCA WebApp Node Launcher</name>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Node WebApp</name>
 
     <dependencies>   
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
+            <artifactId>tuscany-node2-launcher</artifactId>
             <version>1.2-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet 
containers --> 
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
 </project>

Added: 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=638175&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
 (added)
+++ 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
 Mon Mar 17 18:53:18 2008
@@ -0,0 +1,21 @@
+<?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";>
+</contribution>

Propchange: 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml?rev=638175&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
 (added)
+++ 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
 Mon Mar 17 18:53:18 2008
@@ -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>Apache Tuscany SCA Node</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>index.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>

Propchange: 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/index.jsp
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/index.jsp?rev=638175&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/index.jsp
 (added)
+++ 
incubator/tuscany/java/sca/modules/node2-launcher-webapp/src/main/webapp/index.jsp
 Mon Mar 17 18:53:18 2008
@@ -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.
+--%>
+
+<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
+<%@ page import="calculator.CalculatorService" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+%>
+<html>
+<head><title>Apache Tuscany SCA Node</title></head>
+
+<body>
+<p>It works!
+</body>
+</html>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to