[jboss-cvs] JBossBlog SVN: r302 - in trunk/src: action/org/jboss/blog/session/view and 2 other directories.

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

Author: adamw
Date: 2008-05-07 07:41:36 -0400 (Wed, 07 May 2008)
New Revision: 302

Modified:
   trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.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
Log:


Modified: trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java	2008-05-07 11:39:09 UTC (rev 301)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java	2008-05-07 11:41:36 UTC (rev 302)
@@ -9,7 +9,6 @@
 import org.jboss.blog.session.feed.lock.FeedsLocksBean;
 import org.jboss.blog.session.update.UpdateHandlerAsync;
 import org.jboss.blog.session.xml.velocity.TemplateServiceBean;
-import org.jboss.blog.session.security.RestrictedKeyGenerator;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.core.Events;
 import org.jboss.seam.annotations.*;
@@ -53,9 +52,6 @@
     @In
     private Events events;
 
-    @In
-    private RestrictedKeyGenerator restrictedKeyGenerator;
-
     public void initNewFeed(Feed feed) {
         this.feed = feed;
         feed.setMaxPostsInFeed(10);
@@ -64,7 +60,6 @@
         feed.setAccepted(true);
         feed.setPosts(new ArrayList<Post>());
         feed.setPostAuthorType(PostAuthorType.BLOG_AUTHOR_IF_MISSING);
-        feed.setRestrictedKey(restrictedKeyGenerator.generate());
 
         feed.getTemplates().put(XmlType.ATOM, templateService.templatesOfType(XmlType.ATOM).get(0));
     }
@@ -75,20 +70,12 @@
 
     public void setFeed(Feed feed) {
         this.feed = feed;
-
-        if (feed.getRestrictedKey() == null) {
-            reGenerateFeedKey();
-        }
     }
 
     public XmlType[] getTemplateTypes() {
         return new XmlType[] { XmlType.ATOM };
     }
 
-    public void reGenerateFeedKey() {
-        feed.setRestrictedKey(restrictedKeyGenerator.generate());
-    }
-
     @Observer("org.jboss.blog.feed.accept")
     public void acceptFeed() {
         feed.setAccepted(true);

Modified: trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java	2008-05-07 11:39:09 UTC (rev 301)
+++ trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java	2008-05-07 11:41:36 UTC (rev 302)
@@ -40,7 +40,8 @@
                 + "?type=" + type.toString().toLowerCase();
         
         if (feed.getRestricted()) {
-            return base + "&key=" + feed.getRestrictedKey();
+            // TODO
+            return "";
         } 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-07 11:39:09 UTC (rev 301)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java	2008-05-07 11:41:36 UTC (rev 302)
@@ -88,9 +88,7 @@
             Feed feed = feedsService.getFeed(feedName);
 
             boolean isRestricted = feed.getRestricted();
-            if (isRestricted && !GeneralTools.objectsEqual(feed.getRestrictedKey(), feedKey)) {
-                throw new FeedNotFoundException();
-            }
+            // TODO: key
 
             if (feed.getTemplates().get(xmlType) == null) {
                 throw new InvalidTemplateTypeException();

Modified: trunk/src/model/org/jboss/blog/model/feed/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/feed/Feed.java	2008-05-07 11:39:09 UTC (rev 301)
+++ trunk/src/model/org/jboss/blog/model/feed/Feed.java	2008-05-07 11:41:36 UTC (rev 302)
@@ -220,14 +220,6 @@
         this.restricted = restricted;
     }
 
-    public String getRestrictedKey() {
-        return restrictedKey;
-    }
-
-    public void setRestrictedKey(String restrictedKey) {
-        this.restrictedKey = restrictedKey;
-    }
-
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof Feed)) return false;