[jboss-cvs] jboss-seam/seam-gen/view ...

[Gavin King]

  User: gavin   
  Date: 07/06/08 22:35:31

  Modified:    seam-gen/view     edit.page.xml.ftl list.page.xml.ftl
                        login.page.xml view.page.xml.ftl
  Log:
  use xsd
  
  Revision  Changes    Path
  1.16      +6 -6      jboss-seam/seam-gen/view/edit.page.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: edit.page.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/edit.page.xml.ftl,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- edit.page.xml.ftl	22 May 2007 02:21:18 -0000	1.15
  +++ edit.page.xml.ftl	9 Jun 2007 02:35:31 -0000	1.16
  @@ -1,13 +1,13 @@
  -<!DOCTYPE page PUBLIC
  -          "-//JBoss/Seam Pages Configuration DTD 1.3//EN"
  -          "http://jboss.com/products/seam/pages-1.3.dtd">
  -
  +<?xml version="1.0" encoding="UTF-8"?>
   <#assign entityName = pojo.shortName>
   <#assign componentName = util.lower(entityName)>
   <#assign homeName = componentName + "Home">
   <#assign masterPageName = entityName + "List">
   <#assign pageName = entityName>
  -<page no-conversation-view-id="/${masterPageName}.xhtml"
  +<page xmlns="http://jboss.com/products/seam/pages"
  +      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +      xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-1.3.xsd"
  +      no-conversation-view-id="/${masterPageName}.xhtml"
                  login-required="true">
      
      <begin-conversation join="true"/>
  
  
  
  1.8       +6 -5      jboss-seam/seam-gen/view/list.page.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: list.page.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/list.page.xml.ftl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- list.page.xml.ftl	22 May 2007 02:21:18 -0000	1.7
  +++ list.page.xml.ftl	9 Jun 2007 02:35:31 -0000	1.8
  @@ -1,11 +1,11 @@
  -<!DOCTYPE page PUBLIC
  -          "-//JBoss/Seam Pages Configuration DTD 1.3//EN"
  -          "http://jboss.com/products/seam/pages-1.3.dtd">
  +<?xml version="1.0" encoding="UTF-8"?>
  +<page xmlns="http://jboss.com/products/seam/pages"
  +      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +      xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-1.3.xsd">
   
   <#assign entityName = pojo.shortName>
   <#assign componentName = util.lower(entityName)>
   <#assign listName = componentName + "List">
  -<page>
      <param name="firstResult" value="${'#'}{${listName}.firstResult}"/>
      <param name="order" value="${'#'}{${listName}.order}"/>
      <param name="from"/>
  @@ -24,4 +24,5 @@
   </#if>
   </#if>
   </#foreach>
  +
   </page>
  
  
  
  1.4       +5 -4      jboss-seam/seam-gen/view/login.page.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: login.page.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/login.page.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- login.page.xml	22 May 2007 02:21:18 -0000	1.3
  +++ login.page.xml	9 Jun 2007 02:35:31 -0000	1.4
  @@ -1,11 +1,12 @@
  -<!DOCTYPE page PUBLIC
  -          "-//JBoss/Seam Pages Configuration DTD 1.3//EN"
  -          "http://jboss.com/products/seam/pages-1.3.dtd">
  +<?xml version="1.0" encoding="UTF-8"?>
  +<page xmlns="http://jboss.com/products/seam/pages"
  +      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +      xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-1.3.xsd">
   
  -<page>
      <navigation from-action="#{identity.login}">
         <rule if="#{identity.loggedIn}">
            <redirect view-id="/home.xhtml"/>
         </rule>
      </navigation>
  +
   </page>
  
  
  
  1.6       +6 -5      jboss-seam/seam-gen/view/view.page.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: view.page.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/view.page.xml.ftl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- view.page.xml.ftl	22 May 2007 02:21:18 -0000	1.5
  +++ view.page.xml.ftl	9 Jun 2007 02:35:31 -0000	1.6
  @@ -1,11 +1,11 @@
  -<!DOCTYPE page PUBLIC
  -          "-//JBoss/Seam Pages Configuration DTD 1.3//EN"
  -          "http://jboss.com/products/seam/pages-1.3.dtd">
  +<?xml version="1.0" encoding="UTF-8"?>
  +<page xmlns="http://jboss.com/products/seam/pages"
  +      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +      xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-1.3.xsd">
   
   <#assign entityName = pojo.shortName>
   <#assign componentName = util.lower(entityName)>
   <#assign homeName = componentName + "Home">
  -<page>
      <param name="${componentName}From"/>
   <#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
   <#if c2j.isComponent(pojo.identifierProperty)>
  @@ -20,4 +20,5 @@
   <#if entities.add(pojo.shortName)>
   <#include "param.xml.ftl">
   </#if>
  +
   </page>