Author: norman.richards(a)jboss.com Date: 2008-10-12 15:10:17 -0400 (Sun, 12 Oct 2008) New Revision: 9276 Removed: trunk/examples/blog/view/index.html Modified: trunk/examples/blog/resources/WEB-INF/components.xml trunk/examples/blog/resources/WEB-INF/pages.xml trunk/examples/blog/resources/WEB-INF/web.xml trunk/examples/blog/resources/accessible.properties trunk/examples/blog/resources/default.properties trunk/examples/blog/resources/printable.properties trunk/examples/blog/src/actions/SearchService.java trunk/examples/blog/src/test/BlogTest.java trunk/examples/blog/view/index.xhtml trunk/examples/blog/view/index.xml trunk/examples/blog/view/menu.xhtml trunk/examples/blog/view/nav.xhtml trunk/examples/blog/view/search.xhtml trunk/examples/blog/view/template.xhtml Log: JBSEAM-3488 Modified: trunk/examples/blog/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/blog/resources/WEB-INF/components.xml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/resources/WEB-INF/components.xml 2008-10-12 19:10:17 UTC (rev 9276) @@ -5,6 +5,7 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:theme="http://jboss.com/products/seam/theme" xmlns:cache="http://jboss.com/products/seam/cache" + xmlns:web="http://jboss.com/products/seam/web" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd @@ -12,10 +13,13 @@ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd http://jboss.com/products/seam/theme http://jboss.com/products/seam/theme-2.1.xsd http://jboss.com/products/seam/cache http://jboss.com/products/seam/cache-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true"/> - + + <web:rewrite-filter view-mapping="/seam/*" /> + <security:identity authenticate-method="#{authenticator.authenticate}"/> <theme:theme-selector> Modified: trunk/examples/blog/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/blog/resources/WEB-INF/pages.xml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/resources/WEB-INF/pages.xml 2008-10-12 19:10:17 UTC (rev 9276) @@ -2,54 +2,60 @@ <pages 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" - + login-view-id="/login.xhtml"> + + <page view-id="/index.xhtml"> + <rewrite pattern="/" /> + </page> - <page view-id="/search.xhtml"> - - <param name="searchPattern" - value="#{searchService.searchPattern}"/> - - </page> + <page view-id="/search.xhtml"> + <rewrite pattern="/search/{searchPattern}"/> + <rewrite pattern="/search"/> + + <param name="searchPattern" + value="#{searchService.searchPattern}"/> + </page> - <page view-id="/entry.xhtml"> - - <param name="blogEntryId" - value="#{blogEntry.id}"/> - - <action execute="#{entryAction.loadBlogEntry(blogEntry.id)}"/> - - </page> + <page view-id="/entry.xhtml"> + <rewrite pattern="/entry/{blogEntryId}" /> + <rewrite pattern="/entry" /> + + <param name="blogEntryId" + value="#{blogEntry.id}"/> + + <action execute="#{entryAction.loadBlogEntry(blogEntry.id)}"/> + </page> + + <page view-id="/post.xhtml" login-required="true"> + <rewrite pattern="/post" /> + + <action execute="#{postAction.post}" + if="#{validation.succeeded}"/> + + <action execute="#{postAction.invalid}" + if="#{validation.failed}"/> + + <navigation from-action="#{postAction.post}"> + <redirect view-id="/index.xhtml"/> + </navigation> + </page> + + <page view-id="/login.xhtml"> + <rewrite pattern="/login"/> + <action execute="#{identity.login}" + if="#{validation.succeeded}"/> + + <navigation> + <rule if="#{identity.loggedIn}"> + <redirect view-id="/post.xhtml"/> + </rule> + </navigation> + + </page> - <page view-id="/post.xhtml" login-required="true"> - - <action execute="#{postAction.post}" - if="#{validation.succeeded}"/> - - <action execute="#{postAction.invalid}" - if="#{validation.failed}"/> - - <navigation from-action="#{postAction.post}"> - <redirect view-id="/index.xhtml"/> - </navigation> - - </page> - - <page view-id="/login.xhtml"> - - <action execute="#{identity.login}" - if="#{validation.succeeded}"/> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/post.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="*"> - <action execute="#{blog.hitCount.hit}"/> - </page> - + <page view-id="*"> + <action execute="#{blog.hitCount.hit}"/> + </page> + </pages> Modified: trunk/examples/blog/resources/WEB-INF/web.xml =================================================================== --- trunk/examples/blog/resources/WEB-INF/web.xml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/resources/WEB-INF/web.xml 2008-10-12 19:10:17 UTC (rev 9276) @@ -5,19 +5,19 @@ 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"> - <display-name>Seam Blog Example</display-name> - - <error-page> - <error-code>404</error-code> - <location>/seam/404.xhtml</location> - </error-page> + <display-name>Seam Blog Example</display-name> + + <error-page> + <error-code>404</error-code> + <location>/seam/404.xhtml</location> + </error-page> + + <!-- Seam --> - <!-- Seam --> - <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> </listener> - + <filter> <filter-name>Seam Filter</filter-name> <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> Modified: trunk/examples/blog/resources/accessible.properties =================================================================== --- trunk/examples/blog/resources/accessible.properties 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/resources/accessible.properties 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,2 +1,2 @@ -css ../accessible.css +css #{request.contextPath}/accessible.css template template.xhtml Modified: trunk/examples/blog/resources/default.properties =================================================================== --- trunk/examples/blog/resources/default.properties 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/resources/default.properties 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,2 +1,2 @@ -css ../screen.css +css #{request.contextPath}/screen.css template template.xhtml Modified: trunk/examples/blog/resources/printable.properties =================================================================== --- trunk/examples/blog/resources/printable.properties 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/resources/printable.properties 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,2 +1,2 @@ -css ../printable.css +css #{request.contextPath}/printable.css template print.xhtml Modified: trunk/examples/blog/src/actions/SearchService.java =================================================================== --- trunk/examples/blog/src/actions/SearchService.java 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/src/actions/SearchService.java 2008-10-12 19:10:17 UTC (rev 9276) @@ -32,11 +32,7 @@ @Factory("searchResults") public List<BlogEntry> getSearchResults() { - if (searchPattern==null) - { - return null; - } - else if ("".equals(searchPattern) ) { + if (searchPattern==null || "".equals(searchPattern) ) { searchPattern = null; return entityManager.createQuery("select be from BlogEntry be order by date desc").getResultList(); } Modified: trunk/examples/blog/src/test/BlogTest.java =================================================================== --- trunk/examples/blog/src/test/BlogTest.java 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/src/test/BlogTest.java 2008-10-12 19:10:17 UTC (rev 9276) @@ -198,8 +198,10 @@ assert themes.get(0).getLabel().equals("default"); assert themes.get(0).getLabel().equals("default"); assert "default".equals(getValue("#{themeSelector.theme}")); - assert "../screen.css".equals(getValue("#{theme.css}")); + assert "template.xhtml".equals(getValue("#{theme.template}")); + // we can't do interpolate the value correctly in these tests + // assert "/screen.css".equals(getValue("#{theme.css}")); assert "foo".equals(getValue("#{theme.foo}")); } @@ -221,7 +223,7 @@ protected void renderResponse() throws Exception { assert "accessible".equals(getValue("#{themeSelector.theme}")); - assert "../accessible.css".equals(getValue("#{theme.css}")); + //assert "/accessible.css".equals(getValue("#{theme.css}")); assert "template.xhtml".equals(getValue("#{theme.template}")); } }.run(); @@ -238,7 +240,7 @@ protected void renderResponse() throws Exception { assert "printable".equals(getValue("#{themeSelector.theme}")); - assert "../printable.css".equals(getValue("#{theme.css}")); + //assert "/printable.css".equals(getValue("#{theme.css}")); assert "print.xhtml".equals(getValue("#{theme.template}")); Map<String, String> theme = Theme.instance(); assert theme.entrySet().size() == 2; Deleted: trunk/examples/blog/view/index.html =================================================================== --- trunk/examples/blog/view/index.html 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/view/index.html 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,5 +0,0 @@ -<html> -<head> - <meta http-equiv="Refresh" content="0; URL=seam/index.xhtml"> -</head> -</html> \ No newline at end of file Modified: trunk/examples/blog/view/index.xhtml =================================================================== --- trunk/examples/blog/view/index.xhtml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/view/index.xhtml 2008-10-12 19:10:17 UTC (rev 9276) @@ -17,20 +17,20 @@ <s:formattedText value="#{blogEntry.excerpt==null ? blogEntry.body : blogEntry.excerpt}"/> </div> <p> - <h:outputLink value="entry.xhtml" rendered="#{blogEntry.excerpt!=null}"> + <s:link view="/entry.xhtml" rendered="#{blogEntry.excerpt!=null}" propagation="none" + value="Read more..."> <f:param name="blogEntryId" value="#{blogEntry.id}"/> - Read more... - </h:outputLink> + </s:link> </p> <p> [Posted on&#160; - <h:outputText value="#{blogEntry.date}"> - <f:convertDateTime timeZone="#{blog.timeZone}" locale="#{blog.locale}" type="both"/> - </h:outputText>] + <h:outputText value="#{blogEntry.date}"> + <f:convertDateTime timeZone="#{blog.timeZone}" locale="#{blog.locale}" type="both"/> + </h:outputText>] &#160; - <h:outputLink value="entry.xhtml">[Link] + <s:link view="/entry.xhtml" propagation="none" value="[Link]"> <f:param name="blogEntryId" value="#{blogEntry.id}"/> - </h:outputLink> + </s:link> </p> </div> </h:column> Modified: trunk/examples/blog/view/index.xml =================================================================== --- trunk/examples/blog/view/index.xml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/view/index.xml 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,12 +1,11 @@ <?xml version="1.0"?> -<feed xmlns="http://www.w3.org/2005/Atom" - 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"> - -<f:view contentType="application/xhtml+xml"> +<f:view contentType="application/atom+xml" + 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"> +<feed xmlns="http://www.w3.org/2005/Atom"> <title>#{blog.name}</title> <subtitle>#{blog.description}</subtitle> <link href="http://localhost:8080/seam-blog"/> @@ -26,7 +25,7 @@ </summary> </entry> </ui:repeat> - +</feed> </f:view> -</feed> + Modified: trunk/examples/blog/view/menu.xhtml =================================================================== --- trunk/examples/blog/view/menu.xhtml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/view/menu.xhtml 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,18 +1,19 @@ <h:form 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"> - - <span class="menuItem"> - <h:inputText value="#{searchService.searchPattern}"/> - <h:commandButton value="Search" action="/search.xhtml"/> - </span> - - <span class="menuItem"> - <h:selectOneMenu value="#{themeSelector.theme}"> - <f:selectItems value="#{themeSelector.themes}"/> - </h:selectOneMenu> - <h:commandButton action="#{themeSelector.select}" value="Select Theme"/> - </span> - + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + + <span class="menuItem"> + <h:inputText value="#{searchService.searchPattern}"/> + <h:commandButton value="Search" action="/search.xhtml"/> + <s:conversationPropagation type="none"/> + </span> + + <span class="menuItem"> + <h:selectOneMenu value="#{themeSelector.theme}"> + <f:selectItems value="#{themeSelector.themes}"/> + </h:selectOneMenu> + <h:commandButton action="#{themeSelector.select}" value="Select Theme"/> + </span> </h:form> Modified: trunk/examples/blog/view/nav.xhtml =================================================================== --- trunk/examples/blog/view/nav.xhtml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/view/nav.xhtml 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,17 +1,14 @@ <span 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" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> - <h:outputLink value="search.xhtml"> - [All posts] - <f:param name="searchPattern" value=""/> - </h:outputLink> + <s:link view="/search.xhtml" value="[All posts]" propagation="none"> + <f:param name="searchPattern" value=""/> + </s:link> + <s:link view="/index.xhtml" value="[Recent posts]" propagation="none" /> + <s:link view="/post.xhtml" value="[Write new post]" propagation="none" /> + <s:link view="/index.xml" value="[Atom feed]" propagation="none" /> - <h:outputLink value="index.xhtml">[Recent posts]</h:outputLink> - - <h:outputLink value="post.xhtml">[Write new post]</h:outputLink> - - <h:outputLink value="index.xml">[Atom feed]</h:outputLink> - </span> Modified: trunk/examples/blog/view/search.xhtml =================================================================== --- trunk/examples/blog/view/search.xhtml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/view/search.xhtml 2008-10-12 19:10:17 UTC (rev 9276) @@ -1,6 +1,7 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" @@ -10,14 +11,13 @@ <h:dataTable value="#{searchResults}" var="blogEntry"> <h:column> <div> - <h:outputLink value="entry.xhtml"> + <s:link view="/entry.xhtml" propagation="none" value="#{blogEntry.title}"> <f:param name="blogEntryId" value="#{blogEntry.id}"/> - #{blogEntry.title} - </h:outputLink> + </s:link> posted on - <h:outputText value="#{blogEntry.date}"> - <f:convertDateTime timeZone="#{blog.timeZone}" locale="#{blog.locale}" type="both"/> - </h:outputText> + <h:outputText value="#{blogEntry.date}"> + <f:convertDateTime timeZone="#{blog.timeZone}" locale="#{blog.locale}" type="both"/> + </h:outputText> </div> </h:column> </h:dataTable> Modified: trunk/examples/blog/view/template.xhtml =================================================================== --- trunk/examples/blog/view/template.xhtml 2008-10-12 18:50:50 UTC (rev 9275) +++ trunk/examples/blog/view/template.xhtml 2008-10-12 19:10:17 UTC (rev 9276) @@ -12,7 +12,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>#{blog.name}</title> - <link href="#{theme.css}" rel="stylesheet" type="text/css" /> + <link href="#{theme.css}" rel="stylesheet" type="text/css" /> + <link rel="alternate" + type="application/atom+xml" + title="atom" + href="#{request.contextPath}/seam/index.xml" /> + </head> <body>