[jboss-svn-commits] JBL Code SVN: r20166 - in labs/jbossforums/branches/forums120P26/forums/src: main/org/jboss/portlet/forums/ui/view and 1 other directories.

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

Author: dejp
Date: 2008-05-26 13:16:31 -0400 (Mon, 26 May 2008)
New Revision: 20166

Modified:
   labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
   labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
   labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml
   labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml
Log:
JBFORUMS-278

Modified: labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2008-05-26 13:02:31 UTC (rev 20165)
+++ labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2008-05-26 17:16:31 UTC (rev 20166)
@@ -513,6 +513,7 @@
         }
         catch (HibernateException e)
         {
+           e.printStackTrace();
            String message = "Cannot find topics";
            throw new ModuleException(message, e);
         } catch (Exception e) {

Modified: labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
===================================================================
--- labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java	2008-05-26 13:02:31 UTC (rev 20165)
+++ labs/jbossforums/branches/forums120P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java	2008-05-26 17:16:31 UTC (rev 20166)
@@ -112,7 +112,7 @@
          try {
              announcements = BaseController.getForumsModule().findTopicsDesc(forum,
                      Constants.POST_ANNOUNCE,
-                     -1,
+                     0,
                      Integer.MAX_VALUE);
          } catch (Exception e) {
              JSFUtil.handleException(e);
@@ -137,7 +137,7 @@
          try {
              announcements= BaseController.getForumsModule().findTopicsDesc(forum,
                      Constants.POST_ANNOUNCE,
-                     -1,
+                     0,
                      Integer.MAX_VALUE);
              if (announcements!=null && announcements.size()>0) {
                  present = true;
@@ -165,7 +165,7 @@
              //ForumsModule fm = this.getForumsModule();
              stickyThreads = BaseController.getForumsModule().findTopicsDesc(forum,
                              Constants.POST_STICKY,
-                             -1,
+                             0,
                              Integer.MAX_VALUE);
          } catch (Exception e) {
              JSFUtil.handleException(e);
@@ -193,7 +193,7 @@
          try {
              stickyThreads = BaseController.getForumsModule().findTopicsDesc(forum,
                              Constants.POST_STICKY,
-                             -1,
+                             0,
                              Integer.MAX_VALUE);
              if (stickyThreads!=null && stickyThreads.size()>0) {
                  present = true;

Modified: labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml	2008-05-26 13:02:31 UTC (rev 20165)
+++ labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml	2008-05-26 17:16:31 UTC (rev 20166)
@@ -101,8 +101,15 @@
             lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
+        >
+        <!--bag
+            name="attachments"
+            table="jbp_forums_attachments"
+            lazy="true"
+            inverse="true"
+            cascade="all-delete-orphan"
             order-by="jbp_name asc"
-        >
+        -->
 
             <key
                 column="jbp_post_id"

Modified: labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml
===================================================================
--- labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml	2008-05-26 13:02:31 UTC (rev 20165)
+++ labs/jbossforums/branches/forums120P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml	2008-05-26 17:16:31 UTC (rev 20166)
@@ -34,14 +34,14 @@
 	<query name="findAnnouncements"><![CDATA[from TopicImpl as t where t.forum=:forumid and t.type = :type order by t.lastPostDate]]></query>
 	
 	<query name="findTopics"><![CDATA[from TopicImpl]]></query>
-	
+
 	<query name="findTopicsTypeasc"><![CDATA[from TopicImpl as t
                                         join fetch t.poster
                                         where t.forum = :forumid
                                         and t.type = :type
                                         order by t.lastPostDate asc]]></query>
-                                        
-	<query name="findTopicsTypedesc"><![CDATA[from TopicImpl as t
+
+    <query name="findTopicsTypedesc"><![CDATA[from TopicImpl as t
                                         join fetch t.poster
                                         where t.forum = :forumid
                                         and t.type = :type