[jboss-cvs] JBossBlog SVN: r207 - in trunk: src/action/org/jboss/blog/session/view and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 8 06:53:06 EST 2008
Author: adamw
Date: 2008-02-08 06:53:06 -0500 (Fri, 08 Feb 2008)
New Revision: 207
Modified:
trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java
trunk/src/action/org/jboss/blog/session/view/LinkServiceBean.java
trunk/src/model/org/jboss/blog/model/RestrictedPost.java
trunk/src/model/org/jboss/blog/model/feed/Feed.java
trunk/src/model/org/jboss/blog/model/post/filter/AuthorRegexpFilter.java
trunk/view/manage/feed_mod.xhtml
trunk/view/manage/template/template_mod.xhtml
Log:
Modified: trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java 2008-02-08 11:17:30 UTC (rev 206)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java 2008-02-08 11:53:06 UTC (rev 207)
@@ -8,7 +8,6 @@
import org.jboss.blog.service.GroupsService;
import org.jboss.blog.session.feed.InvalidFeedTypeException;
import org.jboss.blog.model.post.filter.AndFilter;
-import org.jboss.blog.session.view.LinkServiceBean;
import org.jboss.blog.tools.GeneralTools;
import org.jboss.seam.ScopeType;
import org.jboss.seam.core.Events;
@@ -39,9 +38,6 @@
private FacesMessages facesMessages;
@In
- private LinkServiceBean linkService;
-
- @In
private GroupsService groupsService;
private AggregatedFeed aggregatedFeed;
@@ -69,7 +65,7 @@
aggregatedFeed.setGlobalFilter(new AndFilter());
feedMod.initNewFeed(aggregatedFeed);
- aggregatedFeed.setLink(linkService.generateFeedPageLink(aggregatedFeed));
+ aggregatedFeed.setLink(null);
} else {
if (feedMod.getFeed() instanceof AggregatedFeed) {
aggregatedFeed = (AggregatedFeed) feedMod.getFeed();
Modified: trunk/src/action/org/jboss/blog/session/view/LinkServiceBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/LinkServiceBean.java 2008-02-08 11:17:30 UTC (rev 206)
+++ trunk/src/action/org/jboss/blog/session/view/LinkServiceBean.java 2008-02-08 11:53:06 UTC (rev 207)
@@ -35,14 +35,14 @@
}
public String generateFeedLink(Feed feed, XmlType type) {
- return serverAddress + "/" + contextName + "/feeds.seam?type=" + type + "&name=" + feed.getName();
+ return serverAddress + "/" + contextName + "/feed/" + feed.getName() + "?type=" + type;
}
public String generateFeedPageLink(Feed feed) {
- return serverAddress + "/" + contextName + "/view/feed.seam?name=" + feed.getName();
+ return serverAddress + "/" + contextName + "/view/" + feed.getName();
}
public String generatePostLink(Post post) {
- return serverAddress + "/" + contextName + "/view/post.seam?post=" + post.getTitleAsId();
+ return serverAddress + "/" + contextName + "/post/" + post.getTitleAsId();
}
}
Modified: trunk/src/model/org/jboss/blog/model/RestrictedPost.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/RestrictedPost.java 2008-02-08 11:17:30 UTC (rev 206)
+++ trunk/src/model/org/jboss/blog/model/RestrictedPost.java 2008-02-08 11:53:06 UTC (rev 207)
@@ -32,4 +32,6 @@
List<? extends RestrictedImage> getImages();
RestrictedFeed getFeed();
+
+ String getEffectiveAuthor();
}
Modified: trunk/src/model/org/jboss/blog/model/feed/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/feed/Feed.java 2008-02-08 11:17:30 UTC (rev 206)
+++ trunk/src/model/org/jboss/blog/model/feed/Feed.java 2008-02-08 11:53:06 UTC (rev 207)
@@ -46,7 +46,6 @@
private String author;
@Length(max = 512)
- @NotEmpty
private String link;
@OneToMany(cascade = {CascadeType.REMOVE}, mappedBy = "feed")
Modified: trunk/src/model/org/jboss/blog/model/post/filter/AuthorRegexpFilter.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/post/filter/AuthorRegexpFilter.java 2008-02-08 11:17:30 UTC (rev 206)
+++ trunk/src/model/org/jboss/blog/model/post/filter/AuthorRegexpFilter.java 2008-02-08 11:53:06 UTC (rev 207)
@@ -29,7 +29,7 @@
}
public boolean filter(RestrictedPost post) {
- return pattern.matcher(post.getAuthor()).matches();
+ return pattern.matcher(post.getEffectiveAuthor()).matches();
}
private void writeObject(java.io.ObjectOutputStream out)
Modified: trunk/view/manage/feed_mod.xhtml
===================================================================
--- trunk/view/manage/feed_mod.xhtml 2008-02-08 11:17:30 UTC (rev 206)
+++ trunk/view/manage/feed_mod.xhtml 2008-02-08 11:53:06 UTC (rev 207)
@@ -71,16 +71,11 @@
</a:outputPanel>
</h:panelGroup>
-<h:outputLabel for="link"><span class="required">*</span> Link to blog:</h:outputLabel>
-<h:panelGroup>
- <h:inputText id="link" value="#{feedMod.feed.link}" required="true" size="48" maxlength="64">
- <a:support event="onblur" reRender="linkMessage" ajaxSingle="true" bypassUpdates="true"/>
+<h:outputLabel for="link" rendered="#{not (feedMod.feed.link == null)}">Link to blog:</h:outputLabel>
+<h:panelGroup rendered="#{not (feedMod.feed.link == null)}">
+ <h:inputText id="link" value="#{feedMod.feed.link}" size="48" maxlength="64" disabled="true">
<s:validate />
</h:inputText>
-
- <a:outputPanel id="linkMessage">
- <h:message for="link" styleClass="error" />
- </a:outputPanel>
</h:panelGroup>
<h:outputLabel for="group"><span class="required">*</span> Group:</h:outputLabel>
Modified: trunk/view/manage/template/template_mod.xhtml
===================================================================
--- trunk/view/manage/template/template_mod.xhtml 2008-02-08 11:17:30 UTC (rev 206)
+++ trunk/view/manage/template/template_mod.xhtml 2008-02-08 11:53:06 UTC (rev 207)
@@ -81,7 +81,7 @@
<li>$feed - the <code>org.jboss.blog.model.Feed</code> object, for which the feed is being generated</li>
<li>$posts - a list of <code>org.jboss.blog.model.Post</code> objects, which is the list of posts
for the feed</li>
- <li>$templateType - the type of the template being generated (one of the enum values
+ <li>$xmlType - the type of the template being generated (one of the enum values
<code>org.jboss.blog.model.TemplateType</code>)</li>
<li>$tools - a utility object containing the following functions:
<ul>
More information about the jboss-cvs-commits
mailing list