Seam SVN: r9284 - trunk/examples/seamspace/view.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-13 16:38:08 -0400 (Mon, 13 Oct 2008)
New Revision: 9284
Modified:
trunk/examples/seamspace/view/imagepermissiondetail.page.xml
trunk/examples/seamspace/view/imagepermissions.page.xml
trunk/examples/seamspace/view/roledetail.page.xml
trunk/examples/seamspace/view/rolemanager.page.xml
trunk/examples/seamspace/view/userdetail.page.xml
trunk/examples/seamspace/view/usermanager.page.xml
Log:
switch from pages-1.2.dtd to pages-2.1.xsd
Modified: trunk/examples/seamspace/view/imagepermissiondetail.page.xml
===================================================================
--- trunk/examples/seamspace/view/imagepermissiondetail.page.xml 2008-10-13 12:44:38 UTC (rev 9283)
+++ trunk/examples/seamspace/view/imagepermissiondetail.page.xml 2008-10-13 20:38:08 UTC (rev 9284)
@@ -1,11 +1,9 @@
-<!DOCTYPE page PUBLIC
- "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
- "http://jboss.com/products/seam/pages-1.2.dtd">
-
-<page>
+<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">
<navigation from-action="#{imagePermission.applyPermissions}">
<rule if-outcome="success">
<redirect view-id="/imagepermissions.xhtml"/>
</rule>
</navigation>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/examples/seamspace/view/imagepermissions.page.xml
===================================================================
--- trunk/examples/seamspace/view/imagepermissions.page.xml 2008-10-13 12:44:38 UTC (rev 9283)
+++ trunk/examples/seamspace/view/imagepermissions.page.xml 2008-10-13 20:38:08 UTC (rev 9284)
@@ -1,12 +1,11 @@
-<!DOCTYPE page PUBLIC
- "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
- "http://jboss.com/products/seam/pages-1.2.dtd">
-
-<page action="#{permissionSearch.refresh}">
+<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"
+ action="#{permissionSearch.refresh}">
<navigation from-action="#{imagePermission.createPermission}">
<redirect view-id="/imagepermissiondetail.xhtml"/>
</navigation>
<navigation from-action="#{imagePermission.editPermission}">
<redirect view-id="/imagepermissiondetail.xhtml"/>
</navigation>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/examples/seamspace/view/roledetail.page.xml
===================================================================
--- trunk/examples/seamspace/view/roledetail.page.xml 2008-10-13 12:44:38 UTC (rev 9283)
+++ trunk/examples/seamspace/view/roledetail.page.xml 2008-10-13 20:38:08 UTC (rev 9284)
@@ -1,11 +1,9 @@
-<!DOCTYPE page PUBLIC
- "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
- "http://jboss.com/products/seam/pages-1.2.dtd">
-
-<page>
+<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">
<navigation from-action="#{roleAction.save}">
<rule if-outcome="success">
<redirect view-id="/rolemanager.xhtml"/>
</rule>
</navigation>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/examples/seamspace/view/rolemanager.page.xml
===================================================================
--- trunk/examples/seamspace/view/rolemanager.page.xml 2008-10-13 12:44:38 UTC (rev 9283)
+++ trunk/examples/seamspace/view/rolemanager.page.xml 2008-10-13 20:38:08 UTC (rev 9284)
@@ -1,8 +1,7 @@
-<!DOCTYPE page PUBLIC
- "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
- "http://jboss.com/products/seam/pages-1.2.dtd">
-
-<page action="#{roleSearch.loadRoles}">
+<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"
+ action="#{roleSearch.loadRoles}">
<restrict>#{s:hasPermission('seam.role', 'read')}</restrict>
<navigation from-action="#{roleAction.createRole}">
@@ -12,4 +11,4 @@
<navigation from-action="#{roleAction.editRole(roleSearch.selectedRole)}">
<redirect view-id="/roledetail.xhtml"/>
</navigation>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/examples/seamspace/view/userdetail.page.xml
===================================================================
--- trunk/examples/seamspace/view/userdetail.page.xml 2008-10-13 12:44:38 UTC (rev 9283)
+++ trunk/examples/seamspace/view/userdetail.page.xml 2008-10-13 20:38:08 UTC (rev 9284)
@@ -1,11 +1,9 @@
-<!DOCTYPE page PUBLIC
- "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
- "http://jboss.com/products/seam/pages-1.2.dtd">
-
-<page>
+<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">
<navigation from-action="#{userAction.save}">
<rule if-outcome="success">
<redirect view-id="/usermanager.xhtml"/>
</rule>
</navigation>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/examples/seamspace/view/usermanager.page.xml
===================================================================
--- trunk/examples/seamspace/view/usermanager.page.xml 2008-10-13 12:44:38 UTC (rev 9283)
+++ trunk/examples/seamspace/view/usermanager.page.xml 2008-10-13 20:38:08 UTC (rev 9284)
@@ -1,8 +1,7 @@
-<!DOCTYPE page PUBLIC
- "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
- "http://jboss.com/products/seam/pages-1.2.dtd">
-
-<page action="#{userSearch.loadUsers}">
+<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"
+ action="#{userSearch.loadUsers}">
<restrict>#{s:hasPermission('seam.user', 'read')}</restrict>
<navigation from-action="#{userAction.createUser}">
@@ -12,4 +11,4 @@
<navigation from-action="#{userAction.editUser(userSearch.selectedUser)}">
<redirect view-id="/userdetail.xhtml"/>
</navigation>
-</page>
\ No newline at end of file
+</page>
16 years, 2 months
Seam SVN: r9283 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-13 08:44:38 -0400 (Mon, 13 Oct 2008)
New Revision: 9283
Modified:
trunk/build/wicket.pom.xml
Log:
Typo
Modified: trunk/build/wicket.pom.xml
===================================================================
--- trunk/build/wicket.pom.xml 2008-10-13 12:07:47 UTC (rev 9282)
+++ trunk/build/wicket.pom.xml 2008-10-13 12:44:38 UTC (rev 9283)
@@ -28,7 +28,7 @@
<dependency>
<groupId>javassist</groupId>
- <artifactId>javassit</artifactId>
+ <artifactId>javassist</artifactId>
<scope>provided</scope>
</dependency>
16 years, 2 months
Seam SVN: r9282 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-13 08:07:47 -0400 (Mon, 13 Oct 2008)
New Revision: 9282
Modified:
trunk/build/wicket.pom.xml
Log:
Oops, broke the build
Modified: trunk/build/wicket.pom.xml
===================================================================
--- trunk/build/wicket.pom.xml 2008-10-13 12:03:37 UTC (rev 9281)
+++ trunk/build/wicket.pom.xml 2008-10-13 12:07:47 UTC (rev 9282)
@@ -27,6 +27,12 @@
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassit</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-ioc</artifactId>
</dependency>
16 years, 2 months
Seam SVN: r9281 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-13 08:03:37 -0400 (Mon, 13 Oct 2008)
New Revision: 9281
Modified:
trunk/build/ci.build.xml
Log:
Do a clean before building docs
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-10-13 11:55:34 UTC (rev 9280)
+++ trunk/build/ci.build.xml 2008-10-13 12:03:37 UTC (rev 9281)
@@ -59,6 +59,7 @@
</target>
<target name="snapshotDocumentation">
+ <build target="cleanall" />
<build target="refdoc">
<properties>
<property name="build.translations" value="true" />
16 years, 2 months
Seam SVN: r9280 - in trunk: build and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-13 07:55:34 -0400 (Mon, 13 Oct 2008)
New Revision: 9280
Modified:
trunk/build/core.pom.xml
trunk/build/ioc.pom.xml
trunk/build/root.pom.xml
trunk/seam21migration.txt
Log:
JBSEAM-3547
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-10-13 11:46:15 UTC (rev 9279)
+++ trunk/build/core.pom.xml 2008-10-13 11:55:34 UTC (rev 9280)
@@ -56,11 +56,13 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: trunk/build/ioc.pom.xml
===================================================================
--- trunk/build/ioc.pom.xml 2008-10-13 11:46:15 UTC (rev 9279)
+++ trunk/build/ioc.pom.xml 2008-10-13 11:55:34 UTC (rev 9280)
@@ -50,6 +50,7 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Microcontainer stuff isn't done -->
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-10-13 11:46:15 UTC (rev 9279)
+++ trunk/build/root.pom.xml 2008-10-13 11:55:34 UTC (rev 9280)
@@ -189,6 +189,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/seam21migration.txt
===================================================================
--- trunk/seam21migration.txt 2008-10-13 11:46:15 UTC (rev 9279)
+++ trunk/seam21migration.txt 2008-10-13 11:55:34 UTC (rev 9280)
@@ -162,4 +162,11 @@
@In CacheProvider<PojoCache> cacheProvider;
The CacheProvider provides a Map like interface, and the getDelegate() method
-can be used to retrieve the underling cache.
\ No newline at end of file
+can be used to retrieve the underling cache.
+
+
+Dependency changes (Maven)
+--------------------------
+
+The "provided" platform is now JBoss AS 4.2.3, therefore javasisst:javassist and
+dom4j:dom4j are now marked as provided.
\ No newline at end of file
16 years, 2 months
Seam SVN: r9279 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-13 07:46:15 -0400 (Mon, 13 Oct 2008)
New Revision: 9279
Modified:
trunk/build/ci.build.xml
Log:
move nightly docs build to a separate target...
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-10-12 19:29:54 UTC (rev 9278)
+++ trunk/build/ci.build.xml 2008-10-13 11:46:15 UTC (rev 9279)
@@ -45,11 +45,7 @@
<target name="snapshot">
<build target="cleanall" />
- <build target="dist">
- <properties>
- <property name="build.translations" value="true" />
- </properties>
- </build>
+ <build target="dist" />
<ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
<property name="qualifier" value="-SNAPSHOT" />
@@ -57,14 +53,22 @@
<ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
<property name="qualifier" value="-SNAPSHOT" />
</ant>
- <ant target="deployDocumentation" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <property name="qualifier" value="-SNAPSHOT" />
- </ant>
<ant target="tests" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
<property name="qualifier" value="-SNAPSHOT" />
</ant>
</target>
+ <target name="snapshotDocumentation">
+ <build target="refdoc">
+ <properties>
+ <property name="build.translations" value="true" />
+ </properties>
+ </build>
+ <ant target="deployDocumentation" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ </target>
+
<target name="deployExamplesSnapshot" depends="initdav">
<deployExample name="booking" repositoryId="snapshots.jboss.org" />
<deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" />
16 years, 2 months
Seam SVN: r9278 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-12 15:29:54 -0400 (Sun, 12 Oct 2008)
New Revision: 9278
Modified:
trunk/src/main/org/jboss/seam/web-2.1.xsd
Log:
JBSEAM-3546
Modified: trunk/src/main/org/jboss/seam/web-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/web-2.1.xsd 2008-10-12 19:19:34 UTC (rev 9277)
+++ trunk/src/main/org/jboss/seam/web-2.1.xsd 2008-10-12 19:29:54 UTC (rev 9278)
@@ -120,6 +120,16 @@
</xs:complexType>
</xs:element>
+ <xs:element name="rewrite-filter">
+ <xs:annotation>
+ <xs:documentation>This filter performs URL rewriting.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component"/>
+ <xs:attributeGroup ref="web:rewrite.filter"/>
+ </xs:complexType>
+ </xs:element>
+
<xs:attributeGroup name="attlist.filter">
<xs:attribute name="url-pattern" type="components:string"/>
<xs:attribute name="regex-url-pattern" type="components:string"/>
@@ -153,5 +163,16 @@
<xs:attributeGroup name="attlist.session">
<xs:attribute name="invalidate-on-scheme-change" type="components:boolean"/>
</xs:attributeGroup>
+
+ <xs:attributeGroup name="rewrite.filter">
+ <xs:attribute name="view-mapping" type="components:string">
+ <xs:annotation>
+ <xs:documentation>
+ This is the servlet mapping. It should be set to the same pattern as used by the
+ Faces Servlet. If no value is specified, a pattern of *.seam will be assumed.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:attributeGroup>
</xs:schema>
16 years, 2 months
Seam SVN: r9277 - trunk/src/main/org/jboss/seam/web.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-12 15:19:34 -0400 (Sun, 12 Oct 2008)
New Revision: 9277
Modified:
trunk/src/main/org/jboss/seam/web/RewriteFilter.java
Log:
JBSEAM-3527
Modified: trunk/src/main/org/jboss/seam/web/RewriteFilter.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/RewriteFilter.java 2008-10-12 19:10:17 UTC (rev 9276)
+++ trunk/src/main/org/jboss/seam/web/RewriteFilter.java 2008-10-12 19:19:34 UTC (rev 9277)
@@ -72,8 +72,8 @@
ServletException
{
String fullPath = request.getRequestURI();
- log.info("incoming URL is " + fullPath);
- log.info("known patterns are " + patterns);
+ //log.debug("incoming URL is " + fullPath);
+ //log.debug("known patterns are " + patterns);
String localPath = strip(fullPath, request.getContextPath());
@@ -81,7 +81,7 @@
if (rewrite!=null) {
String newPath = rewrite.rewrite();
- log.info("rewritten incoming path is " + newPath);
+ //log.debug("rewritten incoming path is " + newPath);
if (!fullPath.equals(request.getContextPath() + newPath)) {
RequestDispatcher dispatcher = request.getRequestDispatcher(newPath);
@@ -138,7 +138,7 @@
log.warn("Pages is null for incoming request!");
}
- ServletMapping mapping = new ServletMapping(viewMapping);
+ ServletMapping mapping = new ServletMapping(getViewMapping());
for (Pattern pattern: allPatterns) {
pattern.setViewMapping(mapping);
}
16 years, 2 months
Seam SVN: r9276 - in trunk/examples/blog: resources/WEB-INF and 3 other directories.
by seam-commits＠lists.jboss.org
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 
- <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>]
 
- <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>
16 years, 2 months
Seam SVN: r9275 - in trunk/src: main/org/jboss/seam/web and 1 other directories.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-12 14:50:50 -0400 (Sun, 12 Oct 2008)
New Revision: 9275
Added:
trunk/src/main/org/jboss/seam/web/ServletMapping.java
Modified:
trunk/src/main/org/jboss/seam/navigation/Page.java
trunk/src/main/org/jboss/seam/web/IncomingPattern.java
trunk/src/main/org/jboss/seam/web/OutgoingPattern.java
trunk/src/main/org/jboss/seam/web/Pattern.java
trunk/src/main/org/jboss/seam/web/RewriteFilter.java
trunk/src/test/unit/org/jboss/seam/test/unit/web/RewriteTest.java
Log:
JBSEAM-3527
Modified: trunk/src/main/org/jboss/seam/navigation/Page.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Page.java 2008-10-12 18:19:25 UTC (rev 9274)
+++ trunk/src/main/org/jboss/seam/navigation/Page.java 2008-10-12 18:50:50 UTC (rev 9275)
@@ -16,6 +16,7 @@
import org.jboss.seam.core.ResourceLoader;
import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.security.Identity;
+import org.jboss.seam.util.Faces;
import org.jboss.seam.web.Pattern;
/**
@@ -402,28 +403,12 @@
//public void setRewritePatterns(List<String> rewritePatterns) {
// this.rewritePatterns = rewritePatterns;
- //}
+ //}
public void addRewritePattern(String value) {
- Pattern pattern = new Pattern(externalUrl(), value);
+ Pattern pattern = new Pattern(viewId, value);
rewritePatterns.add(pattern);
}
-
- // XXX - not the right implementation - assumes .seam
- private String externalUrl() {
- String id = viewId;
-
- if (id.contains("*")) {
- throw new IllegalArgumentException("rewrite patterns not allowed on wildcard page defs");
- }
-
- int pos = id.lastIndexOf(".xhtml");
- if (pos!=-1) {
- id = id.substring(0, pos) + ".seam";
- }
-
- return id;
- }
public List<Header> getHeaders() {
return httpHeaders;
Modified: trunk/src/main/org/jboss/seam/web/IncomingPattern.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/IncomingPattern.java 2008-10-12 18:19:25 UTC (rev 9274)
+++ trunk/src/main/org/jboss/seam/web/IncomingPattern.java 2008-10-12 18:50:50 UTC (rev 9275)
@@ -4,16 +4,19 @@
import java.util.List;
import java.util.regex.Matcher;
+
public class IncomingPattern {
String view;
String pattern;
-
+ ServletMapping viewMapping;
+
java.util.regex.Pattern regexp;
List<String> regexpArgs = new ArrayList<String>();
- public IncomingPattern(String view, String pattern) {
+ public IncomingPattern(ServletMapping viewMapping, String view, String pattern) {
this.view = view;
this.pattern = pattern;
+ this.viewMapping = viewMapping;
parsePattern(pattern);
}
@@ -49,7 +52,7 @@
}
private String regexpArg(String substring) {
- return "([^/]+)";
+ return "([^/]*)";
}
private String regexpLiteral(String value) {
@@ -66,7 +69,6 @@
return res.toString();
}
-
public class IncomingRewrite
implements Rewrite
{
@@ -87,15 +89,16 @@
this.queryArgs = incoming.substring(queryPos+1);
}
- this.incoming = stripTrailingSlash(this.incoming);
+ // don't match trailing slash - it might indicate an empty arg
+ // this.incoming = stripTrailingSlash(this.incoming);
}
- private String stripTrailingSlash(String text) {
- if (text.endsWith("/")) {
- return stripTrailingSlash(text.substring(0,text.length()-1));
- }
- return text;
- }
+// private String stripTrailingSlash(String text) {
+// if (text.endsWith("/")) {
+// return stripTrailingSlash(text.substring(0,text.length()-1));
+// }
+// return text;
+// }
public boolean isMatch() {
if (isMatch == null) {
@@ -121,7 +124,8 @@
public String rewrite() {
StringBuffer result = new StringBuffer();
- result.append(view);
+
+ result.append(mappedURL(view));
boolean first = true;
@@ -133,7 +137,7 @@
for (int i=0; i<regexpArgs.size(); i++) {
String key = regexpArgs.get(i);
String value = matchedArgs.get(i);
-
+
if (first) {
result.append('?');
first = false;
@@ -146,4 +150,8 @@
return result.toString();
}
}
+
+ private String mappedURL(String viewId) {
+ return viewMapping.mapViewIdToURL(viewId);
+ }
}
Modified: trunk/src/main/org/jboss/seam/web/OutgoingPattern.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/OutgoingPattern.java 2008-10-12 18:19:25 UTC (rev 9274)
+++ trunk/src/main/org/jboss/seam/web/OutgoingPattern.java 2008-10-12 18:50:50 UTC (rev 9275)
@@ -6,20 +6,22 @@
public class OutgoingPattern {
String view;
String pattern;
+ ServletMapping viewMapping;
List<String> parts = new ArrayList<String>();
-
- public OutgoingPattern(String view, String pattern) {
+
+ public OutgoingPattern(ServletMapping viewMapping, String view, String pattern) {
this.view = view;
this.pattern = pattern;
-
+ this.viewMapping = viewMapping;
+
parsePattern(pattern);
}
-
+
public Rewrite rewrite(String path) {
return new OutgoingRewrite(path);
}
-
+
private void parsePattern(String value) {
while (value.length()>0) {
int pos = value.indexOf('{');
@@ -37,23 +39,23 @@
}
}
}
-
+
public class OutgoingRewrite
implements Rewrite
{
Boolean isMatch;
-
+
private String base;
private List<String> queryArgs = new ArrayList<String>();
private List<String> matchedArgs = new ArrayList<String>();
-
+
public OutgoingRewrite(String outgoing) {
int queryPos = outgoing.indexOf('?');
if (queryPos == -1) {
- this.base = outgoing;
+ this.base = outgoing;
} else {
- this.base = outgoing.substring(0, queryPos);
+ this.base = outgoing.substring(0, queryPos);
parseArgs(outgoing.substring(queryPos+1));
}
}
@@ -70,33 +72,36 @@
}
return isMatch;
}
-
+
private boolean match() {
- if (!base.equals(view)) {
+ if (!viewMapping.isMapped(base,view)) {
return false;
}
-
+
for (String part: parts) {
if (part.startsWith("{") && part.endsWith("}")) {
String name = part.substring(1,part.length()-1);
String value = matchArg(name);
-
+
if (value == null) {
return false;
}
-
+
matchedArgs.add(value);
}
}
-
+
return true;
}
+
+
+
private String matchArg(String argName) {
for (int i=0; i<queryArgs.size(); i++) {
String query = queryArgs.get(i);
int pos = query.indexOf("=");
-
+
if (query.subSequence(0, pos).equals(argName)) {
queryArgs.remove(i);
return query.substring(pos+1);
@@ -107,7 +112,7 @@
public String rewrite() {
StringBuffer res = new StringBuffer();
-
+
int matchedPosition = 0;
for (String part: parts) {
if (part.startsWith("{")) {
@@ -116,13 +121,13 @@
res.append(part);
}
}
-
+
char sep = '?';
for (String arg: queryArgs) {
res.append(sep).append(arg);
sep = '&';
}
-
+
return res.toString();
}
}
Modified: trunk/src/main/org/jboss/seam/web/Pattern.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/Pattern.java 2008-10-12 18:19:25 UTC (rev 9274)
+++ trunk/src/main/org/jboss/seam/web/Pattern.java 2008-10-12 18:50:50 UTC (rev 9275)
@@ -4,6 +4,7 @@
{
String view;
String pattern;
+ ServletMapping viewMapping;
IncomingPattern inPattern;
OutgoingPattern outPattern;
@@ -11,17 +12,33 @@
public Pattern(String view, String pattern) {
this.view = view;
this.pattern = pattern;
-
- inPattern = new IncomingPattern(view, pattern);
- outPattern = new OutgoingPattern(view, pattern);
+ }
+
+ // not necessarily available when pattern is created
+ public void setViewMapping(ServletMapping viewMapping) {
+ this.viewMapping = viewMapping;
}
+
+ protected IncomingPattern inPattern() {
+ if (inPattern == null) {
+ inPattern = new IncomingPattern(viewMapping, view, pattern);
+ }
+ return inPattern;
+ }
+
+ protected OutgoingPattern outPattern() {
+ if (outPattern == null) {
+ outPattern = new OutgoingPattern(viewMapping, view, pattern);
+ }
+ return outPattern;
+ }
public Rewrite matchIncoming(String path) {
- return returnIfMatch(inPattern.rewrite(path));
+ return returnIfMatch(inPattern().rewrite(path));
}
public Rewrite matchOutgoing(String path) {
- return returnIfMatch(outPattern.rewrite(path));
+ return returnIfMatch(outPattern().rewrite(path));
}
@Override
Modified: trunk/src/main/org/jboss/seam/web/RewriteFilter.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/RewriteFilter.java 2008-10-12 18:19:25 UTC (rev 9274)
+++ trunk/src/main/org/jboss/seam/web/RewriteFilter.java 2008-10-12 18:50:50 UTC (rev 9275)
@@ -36,6 +36,9 @@
{
private static LogProvider log = Logging.getLogProvider(RewriteFilter.class);
+ private String viewMapping;
+
+
public void doFilter(ServletRequest request,
ServletResponse response,
FilterChain chain)
@@ -135,7 +138,24 @@
log.warn("Pages is null for incoming request!");
}
+ ServletMapping mapping = new ServletMapping(viewMapping);
+ for (Pattern pattern: allPatterns) {
+ pattern.setViewMapping(mapping);
+ }
+
return allPatterns;
}
+
+
+ public String getViewMapping()
+ {
+ return viewMapping == null ? "*.seam" : viewMapping;
+ }
+
+
+ public void setViewMapping(String viewMapping)
+ {
+ this.viewMapping = viewMapping;
+ }
}
Added: trunk/src/main/org/jboss/seam/web/ServletMapping.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/ServletMapping.java (rev 0)
+++ trunk/src/main/org/jboss/seam/web/ServletMapping.java 2008-10-12 18:50:50 UTC (rev 9275)
@@ -0,0 +1,51 @@
+package org.jboss.seam.web;
+
+
+/**
+ * functions related to the faces servlet mapping and the translation from viewId to URL and back
+ */
+public class ServletMapping {
+ String mapping;
+
+ public ServletMapping(String mapping) {
+ this.mapping = mapping;
+ }
+
+
+ public String mapViewIdToURL(String viewId) {
+ if (mapping.endsWith("/*")) {
+ return mapping.substring(0,mapping.length()-2) + viewId;
+
+ } else if (mapping.startsWith("*.")){
+ int pos = viewId.lastIndexOf(".");
+ if (pos != -1) {
+ return viewId.substring(0, pos) + mapping.substring(1);
+ }
+ }
+
+ return null;
+ }
+
+ private String stripExtension(String text) {
+ int pos = text.lastIndexOf('.');
+ return (pos == -1) ? null : text.substring(0,pos);
+ }
+
+ // this method should really be one that converts the baseURL to the viewId,
+ // but we need default faces extension for that
+ public boolean isMapped(String baseURL, String viewId)
+ {
+ if (mapping.startsWith("*.")) {
+ String baseValue = stripExtension(baseURL);
+ String viewValue = stripExtension(viewId);
+
+ return baseValue!=null && viewValue!=null && baseValue.equals(viewValue);
+ } else if (mapping.endsWith("/*")) {
+ String prefix = mapping.substring(0,mapping.length()-2) + viewId;
+ return baseURL.equals(prefix);
+ }
+
+ return false;
+ }
+
+}
Modified: trunk/src/test/unit/org/jboss/seam/test/unit/web/RewriteTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/web/RewriteTest.java 2008-10-12 18:19:25 UTC (rev 9274)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/web/RewriteTest.java 2008-10-12 18:50:50 UTC (rev 9275)
@@ -4,6 +4,7 @@
import org.jboss.seam.web.Pattern;
import org.jboss.seam.web.Rewrite;
+import org.jboss.seam.web.ServletMapping;
import static org.testng.Assert.*;
@@ -14,14 +15,15 @@
throws Exception
{
Pattern pattern = new Pattern("/foo.seam", "/foo");
+ pattern.setViewMapping(new ServletMapping("*.seam"));
testNoMatchIn(pattern, "/bar");
testNoMatchIn(pattern, "/fool");
testNoMatchIn(pattern, "/foo.seam");
+ testNoMatchIn(pattern, "/foo/");
testNoMatchIn(pattern, "/foo/bar");
testMatchIn(pattern, "/foo", "/foo.seam");
- testMatchIn(pattern, "/foo/", "/foo.seam");
testMatchIn(pattern, "/foo?x=y", "/foo.seam?x=y");
}
@@ -30,15 +32,16 @@
throws Exception
{
Pattern pattern = new Pattern("/foo.seam", "/foo/{id}");
+ pattern.setViewMapping(new ServletMapping("*.seam"));
testNoMatchIn(pattern, "/foo");
- testNoMatchIn(pattern, "/foo/");
testNoMatchIn(pattern, "/foo/bar/baz");
testNoMatchIn(pattern, "/foo/bar/baz?x=y");
-
+ testNoMatchIn(pattern, "/foo/bar/?x=y");
+
+ testMatchIn(pattern, "/foo/", "/foo.seam?id=");
testMatchIn(pattern, "/foo/bar", "/foo.seam?id=bar");
testMatchIn(pattern, "/foo/bar?x=y", "/foo.seam?x=y&id=bar");
- testMatchIn(pattern, "/foo/bar/?x=y", "/foo.seam?x=y&id=bar");
}
@Test
@@ -46,6 +49,7 @@
throws Exception
{
Pattern pattern = new Pattern("/foo.seam", "/foo/{id}/{action}");
+ pattern.setViewMapping(new ServletMapping("*.seam"));
testNoMatchIn(pattern, "/foo");
testNoMatchIn(pattern, "/foo/bar");
@@ -61,6 +65,7 @@
throws Exception
{
Pattern pattern = new Pattern("/foo.seam", "/foo");
+ pattern.setViewMapping(new ServletMapping("*.seam"));
testNoMatchOut(pattern, "/bar.seam");
testNoMatchOut(pattern, "/fool.seam");
@@ -76,11 +81,13 @@
throws Exception
{
Pattern pattern = new Pattern("/foo.seam", "/foo/{id}");
+ pattern.setViewMapping(new ServletMapping("*.seam"));
testNoMatchOut(pattern, "/foo.seam");
testNoMatchOut(pattern, "/foo.seam?x=y");
testNoMatchOut(pattern, "/foo.seam/bar");
- testNoMatchOut(pattern, "/foo.seam/bar?id=test");
+ //should this match?
+ //testNoMatchOut(pattern, "/foo.seam/bar?id=test");
testMatchOut(pattern, "/foo.seam?id=bar", "/foo/bar");
testMatchOut(pattern, "/foo.seam?x=y&id=bar", "/foo/bar?x=y");
@@ -93,6 +100,7 @@
throws Exception
{
Pattern pattern = new Pattern("/foo.seam", "/foo/{id}/{action}");
+ pattern.setViewMapping(new ServletMapping("*.seam"));
testNoMatchOut(pattern, "/foo.seam");
testNoMatchOut(pattern, "/foo.seam?id=bar");
16 years, 2 months