[weld-commits] Weld SVN: r5236 - in archetypes/trunk/jsf: jee-minimal/src/main/resources/archetype-resources/src/main/webapp and 1 other directories.

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-12-08 18:10:49 -0500 (Tue, 08 Dec 2009)
New Revision: 5236

Modified:
   archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
   archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
   archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
Log:
don't confuse users with two different EL syntaxes; in Facelets, they are one and the same


Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2009-12-08 22:27:47 UTC (rev 5235)
+++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2009-12-08 23:10:49 UTC (rev 5236)
@@ -4,12 +4,11 @@
    xmlns:f="http://java.sun.com/jsf/core"
    xmlns:h="http://java.sun.com/jsf/html">
    <h:head>
-      <title>Weld Starter Application</title>
+      <title>Java EE 6 Starter Application</title>
    </h:head>
    <h:body>
       <h1>Hello World!</h1>
-      <p>My weld-injected bean says <span style="color: blue;">#{helloWorld.text}</span> in a JSF EL dialect.</p>
-      <p>You can write the same value using the Unified EL: <span style="color: green;">${helloWorld.text}</span></p>
+      <p>My CDI bean says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p>
 
       <h:form>
          <h2>Bean Validation examples</h2>

Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2009-12-08 22:27:47 UTC (rev 5235)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2009-12-08 23:10:49 UTC (rev 5236)
@@ -4,12 +4,11 @@
    xmlns:f="http://java.sun.com/jsf/core"
    xmlns:h="http://java.sun.com/jsf/html">
    <h:head>
-      <title>Weld Starter Application</title>
+      <title>Java EE 6 Starter Application</title>
    </h:head>
    <h:body>
       <h1>Hello World!</h1>
-      <p>My weld-injected bean says <span style="color: blue;">#{helloWorld.text}</span> in a JSF EL dialect.</p>
-      <p>You can write the same value using the Unified EL: <span style="color: green;">${helloWorld.text}</span></p>
+      <p>My CDI bean says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p>
 
       <h:form>
          <h2>Bean Validation examples</h2>

Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2009-12-08 22:27:47 UTC (rev 5235)
+++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2009-12-08 23:10:49 UTC (rev 5236)
@@ -4,12 +4,11 @@
    xmlns:f="http://java.sun.com/jsf/core"
    xmlns:h="http://java.sun.com/jsf/html">
    <h:head>
-      <title>Weld Starter Application</title>
+      <title>Weld JSF/Servlet Starter Application</title>
    </h:head>
    <h:body>
       <h1>Hello World!</h1>
-      <p>My weld-injected bean says <span style="color: blue;">#{helloWorld.text}</span> in a JSF EL dialect.</p>
-      <p>You can write the same value using the Unified EL: <span style="color: green;">${helloWorld.text}</span></p>
+      <p>My CDI bean says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p>
 
       <h:form>
          <h2>Bean Validation examples</h2>