[seam-commits] Seam SVN: r7704 - trunk/examples/seamdiscs/view.

Author: pete.muir(a)jboss.org Date: 2008-03-26 07:02:54 -0400 (Wed, 26 Mar 2008) New Revision: 7704 Modified: trunk/examples/seamdiscs/view/artist.page.xml trunk/examples/seamdiscs/view/artists.page.xml trunk/examples/seamdiscs/view/disc.page.xml trunk/examples/seamdiscs/view/discs.page.xml trunk/examples/seamdiscs/view/home.page.xml trunk/examples/seamdiscs/view/login.page.xml Log: Use xsd rather than dtd Modified: trunk/examples/seamdiscs/view/artist.page.xml =================================================================== --- trunk/examples/seamdiscs/view/artist.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/artist.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,21 +1,22 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.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-2.1.xsd"> -<page> - <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> + <param name="artistId" value="#{artistHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="cancel"> - <end-conversation/> - <redirect view-id="/artists.xhtml" /> - </rule> - <rule if-outcome="updated"> - <end-conversation/> - <redirect view-id="/artists.xhtml" /> - </rule> - <rule if-outcome="persisted"> - <end-conversation/> - <redirect view-id="/artists.xhtml" /> - </rule> + <rule if-outcome="cancel"> + <end-conversation /> + <redirect view-id="/artists.xhtml" /> + </rule> + <rule if-outcome="updated"> + <end-conversation /> + <redirect view-id="/artists.xhtml" /> + </rule> + <rule if-outcome="persisted"> + <end-conversation /> + <redirect view-id="/artists.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/artists.page.xml =================================================================== --- trunk/examples/seamdiscs/view/artists.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/artists.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,14 +1,15 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.dtd"> - -<page> - <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> - <param name="type" value="#{artistHome.type}"/> +<?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-2.1.xsd"> + + <param name="artistId" value="#{artistHome.id}" + converterId="javax.faces.Integer" /> + <param name="type" value="#{artistHome.type}" /> <navigation> - <rule if-outcome="artist"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/artist.xhtml"/> - </rule> + <rule if-outcome="artist"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/artist.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/disc.page.xml =================================================================== --- trunk/examples/seamdiscs/view/disc.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/disc.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,25 +1,27 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.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-2.1.xsd"> -<page> - <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> + + <param name="discId" value="#{discHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="cancel"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> - <rule if-outcome="updated"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> - <rule if-outcome="persisted"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> - <rule if-outcome="removed"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> + <rule if-outcome="cancel"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> + <rule if-outcome="updated"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> + <rule if-outcome="persisted"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> + <rule if-outcome="removed"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/discs.page.xml =================================================================== --- trunk/examples/seamdiscs/view/discs.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/discs.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,13 +1,14 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.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-2.1.xsd"> -<page> - <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> + <param name="discId" value="#{discHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="disc"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/disc.xhtml"/> - </rule> + <rule if-outcome="disc"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/disc.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/home.page.xml =================================================================== --- trunk/examples/seamdiscs/view/home.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/home.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,18 +1,20 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.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-2.1.xsd"> -<page> - <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> - <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> + <param name="artistId" value="#{artistHome.id}" + converterId="javax.faces.Integer" /> + <param name="discId" value="#{discHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="artist"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/artist.xhtml"/> - </rule> - <rule if-outcome="disc"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/disc.xhtml"/> - </rule> + <rule if-outcome="artist"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/artist.xhtml" /> + </rule> + <rule if-outcome="disc"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/disc.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/login.page.xml =================================================================== --- trunk/examples/seamdiscs/view/login.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/login.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,11 +1,11 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.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-2.1.xsd"> -<page> <navigation from-action="#{identity.login}"> <rule if="#{identity.loggedIn}"> - <redirect view-id="/home.xhtml"/> + <redirect view-id="/home.xhtml" /> </rule> </navigation> </page>