Author: antelder
Date: Sat Jul 4 09:47:47 2009
New Revision: 791090
URL: http://svn.apache.org/viewvc?rev=791090&view=rev
Log:
merge
Modified:
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/ (props
changed)
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
Propchange: tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 4 09:47:47 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-jsf:671193
-/tuscany/java/sca/samples/webapps/helloworld-jsf:788671
+/tuscany/java/sca/samples/webapps/helloworld-jsf:788671,791089
Modified:
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite?rev=791090&r1=791089&r2=791090&view=diff
==============================================================================
---
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
(original)
+++
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
Sat Jul 4 09:47:47 2009
@@ -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">
Modified:
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml?rev=791090&r1=791089&r2=791090&view=diff
==============================================================================
---
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
(original)
+++
tuscany/branches/sca-java-2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
Sat Jul 4 09:47:47 2009
@@ -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)
