You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/10/14 19:08:37 UTC

svn commit: r825195 - in /tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution: ./ src/ src/org/ src/org/apache/tuscany/sca/gae/services/ src/sample/ war/ war/WEB-INF/

Author: rfeng
Date: Wed Oct 14 17:08:37 2009
New Revision: 825195

URL: http://svn.apache.org/viewvc?rev=825195&view=rev
Log:
Add a variant of helloworld-jsp-google-appengine that loads the Tuscany SCA node from the people.apache.org

Added:
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/
      - copied from r816722, tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/pom.xml
      - copied, changed from r822594, tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/pom.xml
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/helloworld-node.xml   (with props)
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/org/
      - copied from r822594, tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/src/org/
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/appengine-web.xml
      - copied unchanged from r822594, tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/war/WEB-INF/appengine-web.xml
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/hello.jsp
      - copied unchanged from r823799, tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/war/hello.jsp
Removed:
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/org/apache/tuscany/sca/gae/services/
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/sample/HelloworldServiceImpl.java
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/web.composite
Modified:
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/.project
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/   (props changed)
    tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/web.xml

Modified: tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/.project
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/.project?rev=825195&r1=816722&r2=825195&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/.project (original)
+++ tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/.project Wed Oct 14 17:08:37 2009
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>sample-helloworld-jsp-google-appengine</name>
+	<name>sample-helloworld-jsp-gae-contribution</name>
 	<comment></comment>
 	<projects>
 	</projects>

Copied: tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/pom.xml (from r822594, tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/pom.xml?p2=tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/pom.xml&p1=tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/pom.xml&r1=822594&r2=825195&rev=825195&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/helloworld-jsp-google-appengine/pom.xml (original)
+++ tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/pom.xml Wed Oct 14 17:08:37 2009
@@ -25,9 +25,9 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>sample-helloworld-jsp-google-appengine</artifactId>
+    <artifactId>sample-helloworld-jsp-gae-contribution</artifactId>
     <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld JSP on Google App Engine</name>
+    <name>Apache Tuscany SCA Sample Helloworld JSP on Google App Engine Contribution</name>
 
     <dependencies>
 

Added: tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/helloworld-node.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/helloworld-node.xml?rev=825195&view=auto
==============================================================================
--- tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/helloworld-node.xml (added)
+++ tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/helloworld-node.xml Wed Oct 14 17:08:37 2009
@@ -0,0 +1,40 @@
+<?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.
+-->
+<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+    uri="http://sample/nodes/TestNode1"
+    domainRegistry = "vm://localhost"
+    domain="http://domain1">
+
+    <!-- Configure the base URIs for a given binding -->
+    <!-- Each base URI is for a protocol supported by the binding -->
+    <binding name="sca:binding.ws" baseURIs="http://localhost:8080/ws https://localhost:8081/ws"/>
+    <binding name="tuscany:binding.rmi" baseURIs="rmi://localhost:8080/rmi"/>
+    <binding name="tuscany:binding.jsonrpc">
+        <baseURI>http://localhost:8080/jsonrpc</baseURI>
+    </binding>
+
+    <!-- Configure a list of contributions -->
+    <contribution uri="http://c1" location="../contributions/helloworld.jar">
+        <deploymentComposite location="war/WEB-INF/web.composite"/>
+    </contribution>
+
+</node>
\ No newline at end of file

Propchange: tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/helloworld-node.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/src/helloworld-node.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 14 17:08:37 2009
@@ -0,0 +1 @@
+appengine-generated

Modified: tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/web.xml?rev=825195&r1=816722&r2=825195&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/web.xml (original)
+++ tuscany/sandbox/rfeng/helloworld-jsp-gae-contribution/war/WEB-INF/web.xml Wed Oct 14 17:08:37 2009
@@ -17,6 +17,12 @@
     <filter>
         <filter-name>tuscany</filter-name>
         <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
+        
+        <init-param>
+            <param-name>node.configuration</param-name>
+            <param-value>http://people.apache.org/~rfeng/tuscany/nodes/helloworld-node.xml</param-value>
+        </init-param>
+        
     </filter>
 
     <filter-mapping>