[jboss-cvs] JBossBlog SVN: r307 - in trunk: src/action/org/jboss/blog/session/feed and 6 other directories.

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

Author: adamw
Date: 2008-05-08 07:32:44 -0400 (Thu, 08 May 2008)
New Revision: 307

Modified:
   trunk/resources/META-INF/security.drl
   trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java
   trunk/src/action/org/jboss/blog/session/security/filtering/FeedsSecurity.java
   trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java
   trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
   trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
   trunk/src/model/org/jboss/blog/model/feed/Feed.java
   trunk/src/model/org/jboss/blog/model/feed/RestrictedFeed.java
   trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java
Log:


Modified: trunk/resources/META-INF/security.drl
===================================================================
--- trunk/resources/META-INF/security.drl	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/resources/META-INF/security.drl	2008-05-08 11:32:44 UTC (rev 307)
@@ -186,10 +186,10 @@
 when
   c: PermissionCheck(name == "feed", action == "view") and
   (
-    Feed(restricted == false)
+    Feed(feedRestricted == false)
   ) or
   (
-    feed : Feed(restricted == true) and
+    feed : Feed(feedRestricted == true) and
     FeedsCombinedRole(role == FeedsSecurityRole.VIEW, id == feed.id)
   )
 then
@@ -199,7 +199,7 @@
 rule CanViewFeedWhenFeedAmin
 when
   c: PermissionCheck(name == "feed", action == "view") and
-  feed : Feed(restricted == true) and
+  feed : Feed(feedRestricted == true) and
   group : Group() from feed.group and
   (
     FeedsCombinedRole(role == FeedsSecurityRole.FEED_ADMIN, id == feed.id)

Modified: trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -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.isRestricted() && FeedSecurityTools.canViewFeed(feed, true)) {
+        if (identity.isLoggedIn() && feed.isFeedRestricted() && 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.isRestricted();
+        boolean isFeedRestricted = feed.isFeedRestricted();
 
         // 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/security/filtering/FeedsSecurity.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/filtering/FeedsSecurity.java	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/src/action/org/jboss/blog/session/security/filtering/FeedsSecurity.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -25,7 +25,7 @@
         ArrayList<Feed> ret = new ArrayList<Feed>();
 
         for (Feed feed : feeds) {
-            boolean isFeedRestricted = feed.isRestricted();
+            boolean isFeedRestricted = feed.isFeedRestricted();
             if (!isFeedRestricted || identity.hasPermission("feed", "view", feed)) {
                 ret.add(feed);
             }

Modified: trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -9,7 +9,7 @@
  */
 public class FeedSecurityTools {
     public static boolean canViewFeed(RestrictedFeed feed, boolean restricted) {
-        if (!feed.isRestricted()) {
+        if (!feed.isFeedRestricted()) {
             return true;
         }
 

Modified: trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -44,7 +44,7 @@
         String base = serverAddress + "/" + contextName + "/xml/" + feed.getName()
                 + "?type=" + type.toString().toLowerCase();
         
-        if (feed.isRestricted()) {
+        if (feed.isFeedRestricted()) {
             return base + "&key=" + securityUserKeys.getKeyOfCurrentUser();
         } else {
             return base;

Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -99,7 +99,7 @@
 
             Feed feed = feedsService.getFeed(feedName);
 
-            boolean isRestricted = feed.isRestricted();
+            boolean isRestricted = feed.isFeedRestricted();
             if (isRestricted) {
                 SecurityUser su = securityUserKeys.seachForSecurityUserByKey(feedKey);
 

Modified: trunk/src/model/org/jboss/blog/model/feed/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/feed/Feed.java	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/src/model/org/jboss/blog/model/feed/Feed.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -221,7 +221,7 @@
     }
 
     @Transient
-    public boolean isRestricted() {
+    public boolean isFeedRestricted() {
         if (restricted == null || !restricted) {
             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-08 11:20:01 UTC (rev 306)
+++ trunk/src/model/org/jboss/blog/model/feed/RestrictedFeed.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -28,5 +28,5 @@
 
     Boolean getShowDelicious();
 
-    boolean isRestricted();
+    boolean isFeedRestricted();
 }

Modified: trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java
===================================================================
--- trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java	2008-05-08 11:20:01 UTC (rev 306)
+++ trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java	2008-05-08 11:32:44 UTC (rev 307)
@@ -13,7 +13,7 @@
         }
 
         Feed feed = (Feed) object;
-        if (feed.isRestricted()) {
+        if (feed.isFeedRestricted()) {
             return "1";
         } else {
             return "0";