From 5d4681a32e93eee2d3e22f71c7870fc68e3ff14a Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 4 Jul 2009 09:46:03 +0000
Subject: Update JSF sample for sca namespace change and missing tuscany config
 in web.xml

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791089 13f79535-47bb-0310-9956-ffa450edef68
---
 .../helloworld-jsf/src/main/webapp/WEB-INF/web.composite       |  4 ++--
 .../webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml     | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 7e2ca0a158..56ed55b2d5 100644
--- a/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
            targetNamespace="http://samples"
            name="Helloworld">
 
diff --git a/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index 7fd6bd6b6b..41098def30 100644
--- a/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
@@ -24,6 +24,16 @@
 
     <description>MyProject web.xml</description>
 
+    <!-- The only web.xml change to the MyFaces Helloworld sample is to add
+         the Tuscany listener and annotation processor context parameter -->
+    <listener>
+       <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
+    </listener>
+    <context-param>
+        <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name>
+        <param-value>org.apache.tuscany.sca.myfaces.TuscanyAnnotationLifecycleProvider</param-value>
+    </context-param>
+
     <!--optional: context-param>
         <description>Comma separated list of URIs of (additional) faces config files.
             (e.g. /WEB-INF/my-config.xml)
-- 
cgit v1.2.3