diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-04 09:47:47 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-04 09:47:47 +0000 |
| commit | 381e3496a8aeb52a14f72673cd0857191d92497c (patch) | |
| tree | 73c4ede72ee64a0c59373324006536299fd33269 | |
| parent | 5d4681a32e93eee2d3e22f71c7870fc68e3ff14a (diff) | |
merge
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791090 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 12 insertions, 2 deletions
diff --git a/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite index 7e2ca0a158..56ed55b2d5 100644 --- a/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite +++ b/branches/sca-java-2.0-M3/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/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml index 7fd6bd6b6b..41098def30 100644 --- a/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml +++ b/branches/sca-java-2.0-M3/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)
|