[jboss-cvs] JBossBlog SVN: r305 - in trunk: src/action/org/jboss/blog/session/feed and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 8 07:11:03 EDT 2008
Author: adamw
Date: 2008-05-08 07:11:03 -0400 (Thu, 08 May 2008)
New Revision: 305
Modified:
trunk/resources/META-INF/persistence-dev.xml
trunk/resources/META-INF/persistence-prod.xml
trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java
trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java
trunk/src/model/org/jboss/blog/model/feed/Feed.java
trunk/src/model/org/jboss/blog/model/feed/RestrictedFeed.java
Log:
Modified: trunk/resources/META-INF/persistence-dev.xml
===================================================================
--- trunk/resources/META-INF/persistence-dev.xml 2008-05-07 15:33:43 UTC (rev 304)
+++ trunk/resources/META-INF/persistence-dev.xml 2008-05-08 11:11:03 UTC (rev 305)
@@ -4,7 +4,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
-
<persistence-unit name="blog">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>java:/blogDatasource</jta-data-source>
@@ -39,8 +38,7 @@
<property name="hibernate.cache.use_second_level_cache" value="true"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
<property name="hibernate.cache.provider_configuration_file_resource_path" value="blog-ehcache.xml" />
-
- <!-- TODO Search -->
+
<!-- use a file system based index -->
<property name="hibernate.search.default.directory_provider"
value="org.hibernate.search.store.FSDirectoryProvider"/>
@@ -56,5 +54,4 @@
value="org.hibernate.search.event.FullTextIndexEventListener"/>
</properties>
</persistence-unit>
-
</persistence>
Modified: trunk/resources/META-INF/persistence-prod.xml
===================================================================
--- trunk/resources/META-INF/persistence-prod.xml 2008-05-07 15:33:43 UTC (rev 304)
+++ trunk/resources/META-INF/persistence-prod.xml 2008-05-08 11:11:03 UTC (rev 305)
@@ -4,7 +4,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
-
<persistence-unit name="blog">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>java:/blogDatasource</jta-data-source>
@@ -40,20 +39,19 @@
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
<property name="hibernate.cache.provider_configuration_file_resource_path" value="blog-ehcache.xml" />
- <!-- Search -->
- <!-- use a file system based index
+ <!-- use a file system based index -->
<property name="hibernate.search.default.directory_provider"
value="org.hibernate.search.store.FSDirectoryProvider"/>
+ <!-- directory where the indexes will be stored -->
<property name="hibernate.search.default.indexBase"
- value="/home/awarski/blog/index"/>
+ value="/Users/adamwarski/jboss/blog-index"/>
<property name="hibernate.ejb.event.post-insert"
value="org.hibernate.search.event.FullTextIndexEventListener"/>
<property name="hibernate.ejb.event.post-update"
value="org.hibernate.search.event.FullTextIndexEventListener"/>
<property name="hibernate.ejb.event.post-delete"
- value="org.hibernate.search.event.FullTextIndexEventListener"/> -->
+ value="org.hibernate.search.event.FullTextIndexEventListener"/>
</properties>
</persistence-unit>
-
</persistence>
Modified: trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java 2008-05-07 15:33:43 UTC (rev 304)
+++ trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java 2008-05-08 11:11:03 UTC (rev 305)
@@ -81,7 +81,7 @@
// We want to get restricted feeds, if we are logged in, the current feed is restricted and
// we have sufficient permissions to view the feed.
- if (identity.isLoggedIn() && feed.getRestricted() && FeedSecurityTools.canViewFeed(feed, true)) {
+ if (identity.isLoggedIn() && feed.isRestricted() && FeedSecurityTools.canViewFeed(feed, true)) {
restricted = true;
}
@@ -89,7 +89,7 @@
}
public List<? extends RestrictedPost> getPosts(RestrictedFeed feed, int from, int to, boolean restricted) {
- boolean isFeedRestricted = feed.getRestricted();
+ boolean isFeedRestricted = feed.isRestricted();
// If the feed isn't restricted, then we set the flag not to include restricted posts.
if (!isFeedRestricted) {
Modified: trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java 2008-05-07 15:33:43 UTC (rev 304)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java 2008-05-08 11:11:03 UTC (rev 305)
@@ -6,6 +6,7 @@
import org.jboss.blog.model.post.PostFilter;
import org.jboss.blog.service.GroupsService;
import org.jboss.blog.session.feed.InvalidFeedTypeException;
+import org.jboss.blog.session.security.tools.FeedSecurityTools;
import org.jboss.blog.model.post.filter.AndFilter;
import org.jboss.blog.tools.GeneralTools;
import org.jboss.seam.ScopeType;
@@ -116,6 +117,16 @@
availableFeeds.add(nextFeed);
}
+
+ for (Feed nextFeed : groupsService.restrictedFeeds(availableGroup)) {
+ if (GeneralTools.objectsEqual(nextFeed, getAggregatedFeed())) {
+ continue;
+ }
+
+ if (FeedSecurityTools.canViewFeed(nextFeed, true)) {
+ availableFeeds.add(nextFeed);
+ }
+ }
}
selectedFeedsFilters = new HashMap<Feed, List<PostFilter>>();
Modified: trunk/src/model/org/jboss/blog/model/feed/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/feed/Feed.java 2008-05-07 15:33:43 UTC (rev 304)
+++ trunk/src/model/org/jboss/blog/model/feed/Feed.java 2008-05-08 11:11:03 UTC (rev 305)
@@ -220,6 +220,15 @@
this.restricted = restricted;
}
+ @Transient
+ public boolean isRestricted() {
+ if (restricted == null || !restricted) {
+ return false;
+ }
+
+ return true;
+ }
+
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Feed)) return false;
Modified: trunk/src/model/org/jboss/blog/model/feed/RestrictedFeed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/feed/RestrictedFeed.java 2008-05-07 15:33:43 UTC (rev 304)
+++ trunk/src/model/org/jboss/blog/model/feed/RestrictedFeed.java 2008-05-08 11:11:03 UTC (rev 305)
@@ -28,5 +28,5 @@
Boolean getShowDelicious();
- Boolean getRestricted();
+ boolean isRestricted();
}
More information about the jboss-cvs-commits
mailing list