[jboss-cvs] JBossBlog SVN: r157 - in trunk: src/model/org/jboss/blog/model and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2007-12-06 12:08:39 -0500 (Thu, 06 Dec 2007)
New Revision: 157

Modified:
   trunk/resources/WEB-INF/urlrewrite.xml
   trunk/src/model/org/jboss/blog/model/Feed.java
Log:


Modified: trunk/resources/WEB-INF/urlrewrite.xml
===================================================================
--- trunk/resources/WEB-INF/urlrewrite.xml	2007-12-05 18:13:45 UTC (rev 156)
+++ trunk/resources/WEB-INF/urlrewrite.xml	2007-12-06 17:08:39 UTC (rev 157)
@@ -8,7 +8,7 @@
     http://tuckey.org/urlrewrite/
 
 -->
-<urlrewrite>     
+<urlrewrite>
     <!-- Posts view -->
 
     <rule>
@@ -34,24 +34,24 @@
     <!-- Feeds -->
 
     <rule>
-        <from>^/feed/([a-z0-9_/]*)(\?.+)?$</from>
+        <from>^/feed/([a-z0-9_]*)(\?.+)?$</from>
         <to>/feeds.seam?name=$1</to>
     </rule>
 
     <outbound-rule>
-        <from>^/blog/feeds.seam\?type=(\w+)&amp;name=([a-z0-9_/]*)$</from>
+        <from>^/blog/feeds.seam\?type=(\w+)&amp;name=([a-z0-9_]*)$</from>
         <to>/blog/feed/$2?type=$1</to>
     </outbound-rule>
 
     <!-- Feed view -->
 
     <rule>
-        <from>^/view/([a-z0-9_/]*)(\?.+)?$</from>
+        <from>^/view/([a-z0-9_]*)(\?.+)?$</from>
         <to>/view/feed.seam?name=$1$2</to>
     </rule>
 
     <outbound-rule>
-        <from>^/blog/view/feed.seam\?(cid=\d+&amp;)?(from=\d+)&amp;name=(\w+)(.*)$</from>
+        <from>^/blog/view/feed.seam\?(cid=\d+&amp;)?(from=\d+)&amp;name=([a-z0-9_]+)(.*)$</from>
         <to>/blog/view/$3?$1$2$4</to>
     </outbound-rule>
 </urlrewrite>

Modified: trunk/src/model/org/jboss/blog/model/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/Feed.java	2007-12-05 18:13:45 UTC (rev 156)
+++ trunk/src/model/org/jboss/blog/model/Feed.java	2007-12-06 17:08:39 UTC (rev 157)
@@ -22,7 +22,7 @@
     @NotEmpty
     @Length(max = 16)
     @Column(unique = true)
-    @Pattern(regex = "^[a-z0-9_/]*$", message = "#{messages['blog.feed.new.invalidname']}")
+    @Pattern(regex = "^[a-z0-9_]*$", message = "#{messages['blog.feed.new.invalidname']}")
     private String name;
 
     @NotEmpty