[jboss-svn-commits] JBL Code SVN: r14147 - in labs/jbossforums/branches/forums101P24/forums/src: main/org/jboss/portlet/forums/impl and 3 other directories.

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

Author: dejp
Date: 2007-08-10 12:58:23 -0400 (Fri, 10 Aug 2007)
New Revision: 14147

Modified:
   labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsModule.java
   labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
   labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
   labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java
   labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
Log:
JBFORUMS-250

Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsModule.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsModule.java	2007-08-10 11:31:44 UTC (rev 14146)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ForumsModule.java	2007-08-10 16:58:23 UTC (rev 14147)
@@ -43,6 +43,16 @@
    void setFloodInterval(int floodInterval);
 
    /**
+   *
+   */
+   String getGuestUserName();
+
+   /**
+   *
+   */
+   void setGuestUserName(String guestUserName);
+   
+   /**
     *
     */
    String getFromAddress();

Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2007-08-10 11:31:44 UTC (rev 14146)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2007-08-10 16:58:23 UTC (rev 14147)
@@ -67,6 +67,8 @@
    
    private int floodInterval;
 
+   private String guestUserName;
+   
    private String fromAddress;
 
 // private final ResourceCacheInvalidatorInterceptor resourceInterceptor;
@@ -138,6 +140,22 @@
    /**
     * @jmx.managed-attribute
     */
+   public String getGuestUserName()
+   {
+       return guestUserName;
+   }
+
+   /**
+    * @jmx.managed-attribute
+    */
+   public void setGuestUserName(String guestUserName)
+   {
+       this.guestUserName = guestUserName;
+   }
+   
+   /**
+    * @jmx.managed-attribute
+    */
    public String getFromAddress()
    {
       return fromAddress;

Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2007-08-10 11:31:44 UTC (rev 14146)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2007-08-10 16:58:23 UTC (rev 14147)
@@ -49,6 +49,7 @@
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLConfig;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLRenderer;
 import org.jboss.portal.format.util.CLLoader;
+import org.jboss.portal.identity.NoSuchUserException;
 import org.jboss.portal.identity.PropertyMap;
 import org.jboss.portal.identity.User;
 import org.jboss.portal.identity.UserModule;
@@ -862,10 +863,42 @@
             {
                 poster = new PosterImpl(userId.toString());
             }
+        } else {
+            poster = getGuestPoster();
         }
 
         return poster;
     }
+    
+    public static Poster getGuestPoster() throws Exception 
+    {
+        Poster poster = null;
+        
+        UserModule userModule = null;
+        User user = null;
+        
+        String guestUserName = BaseController.getForumsModule().getGuestUserName();
+        
+        try
+        {                                
+           userModule = (UserModule)new InitialContext().lookup(ModuleConstants.USERMODULE_JNDINAME);
+           user = userModule.findUserByUserName(guestUserName);
+        }
+        catch (NoSuchUserException e)
+        {
+            user = userModule.createUser(guestUserName, "Guest user account!", null);
+        }
+        
+        Long userId = (Long) user.getId();
+        poster = BaseController.getForumsModule().findPosterByUserId(
+                String.valueOf(userId));
+        
+        if (poster == null) {
+            poster = new PosterImpl(userId.toString());
+        }
+        
+        return poster;
+    }
 
     /**
      * Method used for parsing bbcode and return properly formated text of

Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java	2007-08-10 11:31:44 UTC (rev 14146)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java	2007-08-10 16:58:23 UTC (rev 14147)
@@ -31,11 +31,13 @@
         {
             User user = PortalUtil.getUser();
             
-            Date lastPost = BaseController.getForumsModule().findLastPostDateForUser(user);
+            if (user != null) {
+                Date lastPost = BaseController.getForumsModule().findLastPostDateForUser(user);
             
-            if (lastPost != null)
-            {
-                lastPostTime = lastPost.getTime();
+                if (lastPost != null)
+                {
+                    lastPostTime = lastPost.getTime();
+                }
             }
             
         } catch (Exception e) {

Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml	2007-08-10 11:31:44 UTC (rev 14146)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml	2007-08-10 16:58:23 UTC (rev 14147)
@@ -20,6 +20,8 @@
       <xmbean/>
       <!-- Flood interval in seconds -->
       <attribute name="FloodInterval">30</attribute>
+      <!-- Guest user -->
+      <attribute name="GuestUserName">guest</attribute>
       <!-- Email address used for FROM field of email notification -->
       <attribute name="FromAddress">portal at example.com</attribute>
       <attribute name="JNDIName">java:portal/ForumsModule</attribute>