[jboss-svn-commits] JBL Code SVN: r20168 - in labs/jbossforums/branches/forums110P26/forums: src/main/org/jboss/portlet/forums/format/template and 2 other directories.

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

Author: dejp
Date: 2008-05-26 13:34:07 -0400 (Mon, 26 May 2008)
New Revision: 20168

Modified:
   labs/jbossforums/branches/forums110P26/forums/build.xml
   labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzer.java
   labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerConstants.java
   labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerTokenManager.java
   labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java
   labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
Log:
JBFORUMS-278

Modified: labs/jbossforums/branches/forums110P26/forums/build.xml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/build.xml	2008-05-26 17:33:16 UTC (rev 20167)
+++ labs/jbossforums/branches/forums110P26/forums/build.xml	2008-05-26 17:34:07 UTC (rev 20168)
@@ -308,8 +308,8 @@
 		   <fileset dir="${build.resources}/portal-forums-ear" includes="**/*"/>
 	  </jar>
 	   
-		<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
-		<copy file="${build.lib}/jboss-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+		<require file="${jboss.home}/server/${deploy.dir}/deploy"/>
+		<copy file="${build.lib}/jboss-forums.ear" todir="${jboss.home}/server/${deploy.dir}/deploy"/>
 	</target>
 
    <!--

Modified: labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzer.java
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzer.java	2008-05-26 17:33:16 UTC (rev 20167)
+++ labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzer.java	2008-05-26 17:34:07 UTC (rev 20168)
@@ -1,5 +1,4 @@
 /* Generated By:JavaCC: Do not edit this line. TemplateAnalyzer.java */
-
 /******************************************************************************
  * JBoss, a division of Red Hat                                               *
  * Copyright 2006, Red Hat Middleware, LLC, and individual                    *

Modified: labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerConstants.java
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerConstants.java	2008-05-26 17:33:16 UTC (rev 20167)
+++ labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerConstants.java	2008-05-26 17:34:07 UTC (rev 20168)
@@ -1,5 +1,4 @@
 /* Generated By:JavaCC: Do not edit this line. TemplateAnalyzerConstants.java */
-
 /******************************************************************************
  * JBoss, a division of Red Hat                                               *
  * Copyright 2006, Red Hat Middleware, LLC, and individual                    *

Modified: labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerTokenManager.java
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerTokenManager.java	2008-05-26 17:33:16 UTC (rev 20167)
+++ labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/format/template/TemplateAnalyzerTokenManager.java	2008-05-26 17:34:07 UTC (rev 20168)
@@ -1,5 +1,4 @@
 /* Generated By:JavaCC: Do not edit this line. TemplateAnalyzerTokenManager.java */
-
 /******************************************************************************
  * JBoss, a division of Red Hat                                               *
  * Copyright 2006, Red Hat Middleware, LLC, and individual                    *

Modified: labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java	2008-05-26 17:33:16 UTC (rev 20167)
+++ labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java	2008-05-26 17:34:07 UTC (rev 20168)
@@ -219,11 +219,12 @@
    }
 
 
+   //* order-by="jbp_name asc"
+   
    //TODO:BD - order it by something... is name ok?
    /**
     * @hibernate.bag lazy="true"
     * cascade="all-delete-orphan"
-    * order-by="jbp_name asc"
     * inverse="true"
     * table="jbp_forums_attachments"
     * @hibernate.collection-key column="jbp_post_id"

Modified: labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java	2008-05-26 17:33:16 UTC (rev 20167)
+++ labs/jbossforums/branches/forums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java	2008-05-26 17:34:07 UTC (rev 20168)
@@ -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;