[seam-commits] Seam SVN: r14529 - in branches/community/Seam_2_3/examples-ee6/contactlist: contactlist-ear/src and 11 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri Apr 6 01:03:15 EDT 2012


Author: dhinojosa
Date: 2012-04-06 01:03:10 -0400 (Fri, 06 Apr 2012)
New Revision: 14529

Added:
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/main/
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/main/application/
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/main/application/META-INF/
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/main/application/META-INF/jboss-deployment-structure.xml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/arquillian.xml
Modified:
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/src/main/resources/META-INF/persistence.xml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/faces-config.xml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/web.xml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/editContact.xhtml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/search.xhtml
   branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/viewContact.xhtml
Log:
updated files to work with arquillian

Added: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/main/application/META-INF/jboss-deployment-structure.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/main/application/META-INF/jboss-deployment-structure.xml	                        (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/src/main/application/META-INF/jboss-deployment-structure.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -0,0 +1,14 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+   <deployment>
+      <dependencies>
+         <module name="org.apache.log4j" export="true"/>
+         <module name="org.javassist" export="true"/>
+         <module name="org.hibernate" export="true"/>
+         <module name="org.dom4j" export="true"/>
+         <module name="org.apache.commons.logging" export="true"/>
+         <module name="org.apache.commons.collections" export="true"/>
+         <module name="javax.faces.api" export="true"/>
+         <module name="com.sun.jsf-impl" export="true"/>
+      </dependencies>
+   </deployment>
+</jboss-deployment-structure> 

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -19,23 +19,25 @@
             <artifactId>jboss-seam</artifactId>
             <type>ejb</type>
         </dependency>
+       <dependency>
+          <groupId>org.hibernate.javax.persistence</groupId>
+          <artifactId>hibernate-jpa-2.0-api</artifactId>
+          <scope>provided</scope>
+       </dependency>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.ejb</groupId>
-            <artifactId>ejb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-api</artifactId>
-           <version>2.1</version>
-        </dependency>
+       <dependency>
+          <groupId>org.jboss.spec.javax.ejb</groupId>
+          <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+          <scope>provided</scope>
+       </dependency>
+       <dependency>
+          <groupId>org.jboss.spec.javax.faces</groupId>
+          <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+          <scope>provided</scope>
+       </dependency>
    </dependencies>
    
 </project>

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/src/main/resources/META-INF/persistence.xml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/src/main/resources/META-INF/persistence.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -5,7 +5,7 @@
              version="1.0">
 	<persistence-unit name="userDatabase" transaction-type="JTA">
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
-      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
       <properties>
          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
          <property name="hibernate.show_sql" value="true"/>

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -14,29 +14,36 @@
    <name>Contact List Integration Tests Module (EE6)</name>
 
    <dependencies>
+
       <dependency>
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <classifier>jdk15</classifier>
-      </dependency>
-      <dependency>
          <groupId>org.jboss.seam.examples-ee6</groupId>
          <artifactId>contactlist-ejb</artifactId>
          <type>ejb</type>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.seam</groupId>
-         <artifactId>jboss-seam</artifactId>
-         <type>ejb</type>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>com.sun.faces</groupId>
-         <artifactId>jsf-api</artifactId>
+         <groupId>org.hibernate.javax.persistence</groupId>
+         <artifactId>hibernate-jpa-2.0-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-core</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
+         <groupId>org.jboss.spec.javax.faces</groupId>
+         <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.mail</groupId>
+         <artifactId>mail</artifactId>
+      </dependency>
+      <dependency>
          <groupId>org.seleniumhq.selenium.server</groupId>
          <artifactId>selenium-server</artifactId>
          <classifier>standalone</classifier>
@@ -50,6 +57,7 @@
          <artifactId>functional-tests</artifactId>
          <scope>test</scope>
       </dependency>
+
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
@@ -68,6 +76,35 @@
          <scope>test</scope>
       </dependency>
 
+      <dependency>
+         <groupId>org.jboss.shrinkwrap.resolver</groupId>
+         <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.shrinkwrap.resolver</groupId>
+         <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.spec.javax.el</groupId>
+         <artifactId>jboss-el-api_2.2_spec</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>dom4j</groupId>
+         <artifactId>dom4j</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javassist</groupId>
+         <artifactId>javassist</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-validator</artifactId>
+         <scope>provided</scope>
+      </dependency>
    </dependencies>
 
    <build>
@@ -82,11 +119,16 @@
       </testResources>
       <plugins>
          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>selenium-maven-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>failsafe-maven-plugin</artifactId>
+         </plugin>
+         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <skip>true</skip>
-            </configuration>
+            <artifactId>maven-antrun-plugin</artifactId>
          </plugin>
       </plugins>
    </build>
@@ -165,7 +207,7 @@
       <profile>
          <id>ftest-tomcat</id>
          <properties>
-            <example.context.path>jboss-seam-contactlist</example.context.path>
+            <example.context.path>seam-contactlist</example.context.path>
          </properties>
          <build>
             <plugins>

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java	2012-04-06 05:03:10 UTC (rev 14529)
@@ -2,12 +2,33 @@
 
 import java.util.List;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.example.contactlist.Contact;
-import org.jboss.seam.mock.SeamTest;
-import org.testng.annotations.Test;
+import org.jboss.seam.mock.JUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ContactListTest extends SeamTest
+ at RunWith(Arquillian.class)
+public class ContactListTest extends JUnitSeamTest
 {
+
+   @Deployment(name="<project>Test")
+   @OverProtocol("Servlet 3.0")
+   public static Archive<?> createDeployment()
+   {
+      EnterpriseArchive er = Deployments.contactListDeployment();
+      WebArchive web = er.getAsType(WebArchive.class, "contactlist-web.war");
+
+      web.addClasses(ContactListTest.class);
+
+      return er;
+   }
+
    @Test
    public void testList() throws Exception
    {
@@ -55,6 +76,7 @@
          protected void renderResponse() throws Exception
          {
             List<Contact> contacts = (List<Contact>) getValue("#{contacts.resultList}");
+            System.out.println(contacts.size());
             assert contacts.size()==1;
          }
       }.run();

Added: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java	                        (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java	2012-04-06 05:03:10 UTC (rev 14529)
@@ -0,0 +1,14 @@
+package org.jboss.seam.example.contactlist.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+
+import java.io.File;
+
+public class Deployments {
+   public static EnterpriseArchive contactListDeployment() {
+      return ShrinkWrap.create(ZipImporter.class, "seam-contactlist.ear").importFrom(new File("../contactlist-ear/target/seam-contactlist.ear"))
+              .as(EnterpriseArchive.class);
+   }
+}
\ No newline at end of file

Added: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/arquillian.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/arquillian.xml	                        (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/arquillian.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns="http://jboss.org/schema/arquillian"
+            xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+   <engine>
+      <property name="deploymentExportPath">target/</property>
+   </engine>
+
+   <container qualifier="jboss" default="true">
+      <configuration>
+         <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
+         <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+      </configuration>
+   </container>
+</arquillian>
\ No newline at end of file

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -26,40 +26,52 @@
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.seam</groupId>
-            <artifactId>jboss-seam</artifactId>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.seam</groupId>
-            <artifactId>jboss-seam-ui</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.seam</groupId>
-                    <artifactId>jboss-seam-jul</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-collections</groupId>
-                    <artifactId>commons-collections</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.facelets</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
+      <dependency>
+         <groupId>org.jboss.seam</groupId>
+         <artifactId>jboss-seam</artifactId>
+         <type>ejb</type>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.seam</groupId>
+         <artifactId>jboss-seam-ui</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.seam</groupId>
+               <artifactId>jboss-seam-jul</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency>
+         <groupId>commons-logging</groupId>
+         <artifactId>commons-logging</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.el</groupId>
+         <artifactId>jboss-el</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-validator</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.richfaces.ui</groupId>
+         <artifactId>richfaces-components-ui</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.richfaces.core</groupId>
+         <artifactId>richfaces-core-impl</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.richfaces.core</groupId>
+         <artifactId>richfaces-core-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.spec.javax.faces</groupId>
+         <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+         <scope>provided</scope>
+      </dependency>
     </dependencies>
   
     <build>

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/faces-config.xml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/faces-config.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<faces-config version="1.2"
+<faces-config version="2.1"
               xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd">

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/web.xml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/WEB-INF/web.xml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app version="2.5"
+<web-app version="3.0"
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
 
     <display-name>Seam Contact List Example</display-name>
 

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/editContact.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/editContact.xhtml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/editContact.xhtml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
+<h:html xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
 	  			xmlns:f="http://java.sun.com/jsf/core"
 	  			xmlns:s="http://jboss.com/products/seam/taglib"
 				template="template.xhtml">
-  <head>
+  <h:head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <title>Edit Contact</title>
 	<link href="screen.css" rel="stylesheet" type="text/css" />
-  </head>
-  <body>
+  </h:head>
+  <h:body>
   
     <div class="menuButtons">
       <s:link id="search" view="/search.xhtml" value="Search Contacts"/>
@@ -116,5 +116,5 @@
     
     </div>
     
-  </body>
-</html>
+  </h:body>
+</h:html>

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/search.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/search.xhtml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/search.xhtml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
+<h:html xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
 	  			xmlns:f="http://java.sun.com/jsf/core"
 	  			xmlns:s="http://jboss.com/products/seam/taglib">
-  <head>
+  <h:head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <title>Contact List</title>
 	<link href="screen.css" rel="stylesheet" type="text/css" />
-  </head>
-  <body>
+  </h:head>
+  <h:body>
   
     <div class="menuButtons">
       <s:link id="search" view="/search.xhtml" value="Search Contacts">
@@ -100,5 +100,5 @@
           
       </div>
       
-  </body>
-</html>
+  </h:body>
+</h:html>

Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/viewContact.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/viewContact.xhtml	2012-04-05 22:00:26 UTC (rev 14528)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/src/main/webapp/viewContact.xhtml	2012-04-06 05:03:10 UTC (rev 14529)
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
+<h:html xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
 	  			xmlns:f="http://java.sun.com/jsf/core"
 	  			xmlns:s="http://jboss.com/products/seam/taglib"
 				template="template.xhtml">
-  <head>
+  <h:head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <title>View Contact</title>
 	<link href="screen.css" rel="stylesheet" type="text/css" />
-  </head>
-  <body>
+  </h:head>
+  <h:body>
   
     <div class="menuButtons">
       <s:link id="search" view="/search.xhtml" value="Search Contacts"/>
@@ -122,5 +122,5 @@
 
     </div>
     
-  </body>
-</html>
+  </h:body>
+</h:html>



More information about the seam-commits mailing list