[jboss-svn-commits] JBL Code SVN: r18391 - in labs/jbossforums/branches/multipleforums110P26: build and 16 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 7 13:48:00 EST 2008
Author: sviluppatorefico
Date: 2008-02-07 13:47:59 -0500 (Thu, 07 Feb 2008)
New Revision: 18391
Added:
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/AttachmentImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumInstanceImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml
labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/
labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/component-info.xml
labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/lib/
labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/lib/jboss-cache-jdk50.jar
labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/lib/hibernate3.jar
labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/
labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/component-info.xml
labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/lib/
labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/lib/jgroups.jar
Removed:
labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/lib/hibernate.jar
Modified:
labs/jbossforums/branches/multipleforums110P26/authz-jaae-plugin/build.xml
labs/jbossforums/branches/multipleforums110P26/build/build.xml
labs/jbossforums/branches/multipleforums110P26/forums/build.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumInstanceImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml
labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt
labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/README.txt
Log:
clustering version
Modified: labs/jbossforums/branches/multipleforums110P26/authz-jaae-plugin/build.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/authz-jaae-plugin/build.xml 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/authz-jaae-plugin/build.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -166,10 +166,28 @@
rows to achieve complete create for jboss-forums.ear -->
<copy todir="${forums.root}/resources/portal-forums-ear">
<fileset dir="${build.lib}" includes="portal-forums-authz-plugin.sar"/>
+ </copy>
+ <!-- Luca Stancapiano - 5 feb 2008 - this plugin is also inside new clustered
+ versions of JBossForums -->
+ <copy todir="${forums.root}/resources/portal-forums-ha-ear">
+ <fileset dir="${build.lib}" includes="portal-forums-authz-plugin.sar"/>
+ </copy>
+ <copy todir="${forums.root}/resources/portal-forums-ha-jbp-ear">
+ <fileset dir="${build.lib}" includes="portal-forums-authz-plugin.sar"/>
</copy>
+ <!-- end patch 5 feb 2008 -->
<jar jarfile="${forums.lib}/jboss-forums.ear">
<fileset dir="${forums.root}/resources/portal-forums-ear" includes="**/*"/>
+ </jar>
+ <!-- Luca Stancapiano - 5 feb 2008 - this plugin is also inside new clustered
+ versions of JBossForums as libraries -->
+ <jar jarfile="${forums.lib}/jboss-forums-ha.ear">
+ <fileset dir="${forums.root}/resources/portal-forums-ha-ear" includes="**/*"/>
</jar>
+ <jar jarfile="${forums.lib}/jboss-forums-ha-jbp.ear">
+ <fileset dir="${forums.root}/resources/portal-forums-ha-jbp-ear" includes="**/*"/>
+ </jar>
+ <!-- end patch 5 feb 2008 -->
<!-- end patch 7 apr 2007 -->
Modified: labs/jbossforums/branches/multipleforums110P26/build/build.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/build/build.xml 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/build/build.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -112,11 +112,13 @@
<!-- Modules -->
<module name="forums"/>
<module name="authz-jaae-plugin"/>
+ <!-- Luca Stancapiano - 8 feb 2008 - new plugin for cluster standalone -->
+ <module name="cache-plugin"/>
<!-- setup the default group -->
<group name="default">
- <include modules="forums,authz-jaae-plugin"/>
+ <include modules="forums,authz-jaae-plugin,cache-plugin"/>
</group>
</moduleconfig>
Modified: labs/jbossforums/branches/multipleforums110P26/forums/build.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/build.xml 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/build.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -66,6 +66,8 @@
<call target="configure-libraries"/>
<path id="library.classpath">
<path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="jgroups.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.j2ee.classpath"/>
<path refid="jboss.server.classpath"/>
@@ -172,15 +174,6 @@
<fileset dir="${source.classes}" includes="**/*.java"/>
<jbossxmbean/>
</jmxdoclet>
- <hibernatedoclet
- destDir="${build.resources}/portal-forums-sar">
- <fileset dir="${source.java}">
- <include name="**/impl/*Impl.java"/>
- </fileset>
- <hibernate
- version="3.0"
- destDir="${build.resources}/portal-forums-sar"/>
- </hibernatedoclet>
</target>
<!-- Generate all class files -->
@@ -203,6 +196,9 @@
<hibernate-export properties="${hibernate.properties}" text="true" quiet="true" delimiter=";"
output="${build.resources}/setup/setup.ddl">
<fileset dir="${build.resources}/portal-forums-sar" includes="**/*.hbm.xml"/>
+ <!-- Luca Stancapiano - 8 feb 2008 - added new two modules for cluster -->
+ <fileset dir="${build.resources}/portal-forums-ha-sar" includes="**/*.hbm.xml"/>
+ <fileset dir="${build.resources}/portal-forums-ha-jbp-sar" includes="**/*.hbm.xml"/>
</hibernate-export>
</target>
@@ -254,10 +250,57 @@
<jar jarfile="${build.lib}/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ear" includes="**/*"/>
</jar>
+
+ <!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha.sar -->
+ <jar jarfile="${build.lib}/portal-forums-ha.sar">
+ <fileset dir="${build.resources}/portal-forums-ha-sar" includes="**/*"/>
+ <fileset dir="${jakarta.fileupload.root}/lib" includes="commons-fileupload.jar"/>
+ <fileset dir="${rome.lib}" includes="rome-0.9.jar" />
+ <fileset dir="${jdom.lib}" includes="jdom.jar" />
+ </jar>
+
+ <!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha-jbp.sar -->
+ <jar jarfile="${build.lib}/portal-forums-ha-jbp.sar">
+ <fileset dir="${build.resources}/portal-forums-ha-jbp-sar" includes="**/*"/>
+ <fileset dir="${jakarta.fileupload.root}/lib" includes="commons-fileupload.jar"/>
+ <fileset dir="${rome.lib}" includes="rome-0.9.jar" />
+ <fileset dir="${jdom.lib}" includes="jdom.jar" />
+ </jar>
+
+ <!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha.ear -->
+ <copy todir="${build.resources}/portal-forums-ha-ear">
+ <!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
+ <fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha.sar,portal-forums-authz-plugin.sar"/>
+ <fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar,jsf-example.jar"/>
+ <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,tomahawk.jar"/>
+ <fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.6.jar,commons-el.jar"/>
+ <fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
+ <fileset dir="${jbportal.lib}" includes="portal-faces-lib.jar" />
+ </copy>
+ <jar jarfile="${build.lib}/jboss-forums-ha.ear">
+ <fileset dir="${build.resources}/portal-forums-ha-ear" includes="**/*"/>
+ </jar>
+
+ <!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha-jbp.ear -->
+ <copy todir="${build.resources}/portal-forums-ha-jbp-ear">
+ <!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
+ <fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha-jbp.sar,portal-forums-authz-plugin.sar"/>
+ <fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar,jsf-example.jar"/>
+ <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,tomahawk.jar"/>
+ <fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.6.jar,commons-el.jar"/>
+ <fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
+ <fileset dir="${jbportal.lib}" includes="portal-faces-lib.jar" />
+ </copy>
+ <jar jarfile="${build.lib}/jboss-forums-ha-jbp.ear">
+ <fileset dir="${build.resources}/portal-forums-ha-jbp-ear" includes="**/*"/>
+ </jar>
</target>
<target name="explode" depends="init">
- <explode file="${build.lib}/portal-forums.ear" todir="${build.lib}" name="portal-forums-exploded.ear"/>
+ <explode file="${build.lib}/jboss-forums.ear" todir="${build.resources}" />
+ <!-- Luca Stancapiano - 8 feb 2008 - exploded ha modules -->
+ <explode file="${build.lib}/jboss-forums-ha.ear" todir="${build.resources}" />
+ <explode file="${build.lib}/jboss-forums-ha-jbp.ear" todir="${build.resources}" />
</target>
<!-- ================================================================== -->
@@ -313,6 +356,46 @@
</target>
<!--
+ | Deploy the ha application
+ -->
+ <target name="deploy-ha" description="Deploy ha." depends="output">
+
+ <!-- TEMPORARILY COPIED HERE, NEEDS TO BE REDONE -->
+ <!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha.ear -->
+ <copy todir="${build.resources}/portal-forums-ha-ear">
+ <fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
+ <fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha.sar,portal-forums-authz-plugin.sar"/>
+ <fileset dir="${jbportal.root}/../facelets/lib" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
+ </copy>
+ <jar jarfile="${build.lib}/jboss-forums-ha.ear">
+ <fileset dir="${build.resources}/portal-forums-ha-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"/>
+ </target>
+
+ <!--
+ | Deploy the ha-jbp application
+ -->
+ <target name="deploy-ha-jbp" description="Deploy ha jbp." depends="output">
+
+ <!-- TEMPORARILY COPIED HERE, NEEDS TO BE REDONE -->
+ <!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha.ear -->
+ <copy todir="${build.resources}/portal-forums-ha-jbp-ear">
+ <fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
+ <fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha-jbp.sar,portal-forums-authz-plugin.sar"/>
+ <fileset dir="${jbportal.root}/../facelets/lib" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
+ </copy>
+ <jar jarfile="${build.lib}/jboss-forums-ha-jbp.ear">
+ <fileset dir="${build.resources}/portal-forums-ha-jbp-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"/>
+ </target>
+
+ <!--
| Undeploy the application
-->
<target name="undeploy" description="Undeploy." depends="init">
@@ -320,6 +403,22 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/deploy/portal-forums.ear"/>
</target>
+ <!--
+ | Luca Stancapiano - 8 feb 2008 - Undeploy the ha application
+ -->
+ <target name="undeploy-ha" description="Undeploy ha." depends="init">
+ <require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/deploy/portal-forums-ha.ear"/>
+ </target>
+
+ <!--
+ | Luca Stancapiano - 8 feb 2008 - Undeploy the ha-jbp application
+ -->
+ <target name="undeploy-ha-jbp" description="Undeploy ha jbp." depends="init">
+ <require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/deploy/portal-forums-ha-jbp.ear"/>
+ </target>
+
<target name="test" depends="init">
<property name="build.testlog" value="${module.output}/log"/>
@@ -361,7 +460,11 @@
<classpath>
<pathelement location="${build.classes}"/>
<!--<pathelement location="${build.resources}/portal-core-sar" />-->
+ <!-- Luca Stancapiano - 8 feb 2008 - new ha modules into classpath -->
<pathelement location="${build.resources}/portal-forums-sar"/>
+ <pathelement location="${build.resources}/portal-forums-ha-sar"/>
+ <pathelement location="${build.resources}/portal-forums-ha-jbp-sar"/>
+ <!-- Luca Stancapiano - 8 feb 2008 - end patch -->
<pathelement location="${build.resources}/test"/>
<pathelement location="${jboss.home}/lib/dom4j.jar"/>
<pathelement location="${jboss.config}/lib/hsqldb.jar"/>
@@ -374,6 +477,7 @@
<pathelement location="${dbunit.dbunit.lib}/dbunit.jar"/>
<pathelement location="${jdbc.connectors.lib}/mysql-connector-java.jar"/>
<pathelement location="${jboss.home}/server/default/deploy/jboss-hibernate.deployer/asm.jar"/>
+ <!-- Luca Stancapiano - 8 feb 2008 - no more hibernate.jar -->
<pathelement location="${jboss.home}/server/default/deploy/jboss-hibernate.deployer/hibernate3.jar"/>
<pathelement location="${jboss.home}/server/default/deploy/jboss-hibernate.deployer/cglib-2.1.jar"/>
<pathelement location="${jboss.home}/server/default/deploy/jboss-hibernate.deployer/antlr-2.7.5H3.jar"/>
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -22,7 +22,6 @@
* @author theute
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* $Revision: 1018 $
- * @hibernate.class table="jbp_forums_attachments"
*/
public class AttachmentImpl implements Attachment, Serializable
{
@@ -38,8 +37,6 @@
}
/**
- * @hibernate.property column="jbp_comment"
- * type="text"
*/
public String getComment() {
return comment;
@@ -52,7 +49,6 @@
}
/**
- * @hibernate.component class="org.jboss.portlet.forums.impl.UploadedFileImpl"
*/
public UploadedFile getFile() {
return file;
@@ -65,8 +61,6 @@
}
/**
- * @hibernate.id column="jbp_attachment_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -79,8 +73,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_post_id"
- * class="org.jboss.portlet.forums.impl.PostImpl"
*/
public Post getPost()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -27,8 +27,6 @@
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 916 $
- * @hibernate.class table="jbp_forums_categories"
- * @hibernate.cache usage="read-write"
*/
public class CategoryImpl
implements Serializable,
@@ -52,14 +50,6 @@
}
/**
- * @hibernate.bag lazy="true"
- * inverse="true"
- * cascade="all-delete-orphan"
- * order-by="jbp_order asc"
- * table="jbp_forums_forums"
- * @hibernate.collection-key column="jbp_category_id"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.ForumImpl"
- * @hibernate.collection-cache usage="read-write"
*/
public List getForums()
{
@@ -88,9 +78,6 @@
}
/**
- * @hibernate.property column="jbp_order"
- * unique="false"
- * update="true"
*/
public int getOrder()
{
@@ -108,9 +95,6 @@
}
/**
- * @hibernate.property column="jbp_title"
- * unique="false"
- * update="true"
*/
public String getTitle()
{
@@ -128,8 +112,6 @@
}
/**
- * @hibernate.id column="jbp_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -146,10 +128,6 @@
Forum Instance so that we can to get different instances of forums with different
categories and different sub objects
*/
- /**
- * @hibernate.many-to-one column="jbp_forum_instance_id"
- * class="org.jboss.portlet.forums.impl.ForumInstanceImpl"
- */
public ForumInstance getForumInstance()
{
return forumInstance;
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -37,8 +37,6 @@
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
* @version $Revision: 1124 $
- * @hibernate.class table="jbp_forums_forums"
- * @hibernate.cache usage="read-write"
*/
public class ForumImpl
implements Serializable,
@@ -80,8 +78,6 @@
/**
- * @hibernate.many-to-one column="jbp_category_id"
- * class="org.jboss.portlet.forums.impl.CategoryImpl"
*/
public Category getCategory()
{
@@ -99,9 +95,6 @@
}
/**
- * @hibernate.property column="jbp_description"
- * unique="false"
- * update="true"
*/
public String getDescription()
{
@@ -119,8 +112,6 @@
}
/**
- * @hibernate.id column="jbp_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -179,9 +170,6 @@
}
/**
- * @hibernate.property column="jbp_name"
- * unique="false"
- * update="true"
*/
public String getName()
{
@@ -199,9 +187,6 @@
}
/**
- * @hibernate.property column="jbp_order"
- * unique="false"
- * update="true"
*/
public int getOrder()
{
@@ -219,9 +204,6 @@
}
/**
- * @hibernate.property column="jbp_topic_count"
- * unique="false"
- * update="true"
*/
public int getTopicCount()
{
@@ -248,9 +230,6 @@
}
/**
- * @hibernate.property column="jbp_post_count"
- * unique="false"
- * update="true"
*/
public int getPostCount()
{
@@ -325,9 +304,6 @@
}
/**
- * @hibernate.property column="jbp_status"
- * unique="false"
- * update="true"
*/
public int getStatus()
{
@@ -345,13 +321,6 @@
}
/**
- * @hibernate.bag lazy="true"
- * inverse="true"
- * cascade="all-delete-orphan"
- * order-by="jbp_last_post_date asc"
- * table="jbp_forums_topics"
- * @hibernate.collection-key column="jbp_forum_id"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.TopicImpl"
*/
public List getTopics()
{
@@ -381,11 +350,6 @@
}
/**
- * @hibernate.bag lazy="true"
- * inverse="true"
- * cascade="all"
- * @hibernate.collection-key column="jbp_forum_id"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.ForumWatchImpl"
*/
public Collection getForumWatch()
{
@@ -403,9 +367,6 @@
}
/**
- * @hibernate.property
- * column="jbp_type"
- * update="true"
*/
/*public int getType()
{
@@ -423,11 +384,6 @@
}*/
/**
- * @hibernate.bag lazy="true"
- * inverse="true"
- * cascade="all"
- * @hibernate.collection-key column="jbp_forum_id"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.ForumWatchImpl"
*/
public List getWatches()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumInstanceImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumInstanceImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumInstanceImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -21,7 +21,6 @@
* Instance of forums.
*
* @author <a href="mailto:jedim at vige.it">Luca Stancapiano </a>
- * @hibernate.class table="jbp_forums_instances"
*/
public class ForumInstanceImpl implements Serializable, ForumInstance {
@@ -39,7 +38,6 @@
}
/**
- * @hibernate.id column="jbp_id" generator-class="assigned"
*/
public Integer getId() {
return id;
@@ -50,7 +48,6 @@
}
/**
- * @hibernate.property column="jbp_name" unique="false" update="true"
*/
public String getName() {
return name;
@@ -67,10 +64,6 @@
}
/**
- * @hibernate.bag lazy="true" inverse="true" cascade="all-delete-orphan"
- * order-by="jbp_order" table="jbp_forums_categories"
- * @hibernate.collection-key column="jbp_forum_instance_id"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.CategoryImpl"
*/
public List getCategories() {
return categories;
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -23,8 +23,6 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet </a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
* @version $Revision: 2066 $
- * @hibernate.joined-subclass table="jbp_forums_forumswatch"
- * @hibernate.joined-subclass-key column="jbp_id"
*/
public class ForumWatchImpl
extends WatchImpl
@@ -42,8 +40,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_forum_id"
- * class="org.jboss.portlet.forums.impl.ForumImpl"
*/
public Forum getForum()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -212,10 +212,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("select f " +
- "from ForumImpl f " +
- "left outer join fetch f.topics " +
- "where f.id = :forumId ");
+ Query query = session.getNamedQuery("findForumByIdFetchTopics");
query.setParameter("forumId",id);
List forumList = query.list();
if (forumList == null)
@@ -279,9 +276,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery(" from CategoryImpl as c " +
- " join fetch c.forums " +
- " where c.id=:categoryId ");
+ Query query = session.getNamedQuery("findCategoryByIdFetchForums");
query.setParameter("categoryId",id);
Category category = (Category)query.uniqueResult();
if (category == null)
@@ -313,7 +308,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("from PosterImpl as u where u.userId=:userId");
+ Query query = session.getNamedQuery("findPosterByUserId");
query.setString("userId", userId);
PosterImpl user = (PosterImpl)query.uniqueResult();
return user;
@@ -342,6 +337,7 @@
PosterImpl user = new PosterImpl();
user.setUserId(userId);
session.save(user);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
return user;
}
catch (HibernateException e)
@@ -367,11 +363,7 @@
try {
Session session = getSession();
Query query = session
- .createQuery("from CategoryImpl as c " +
- // Luca Stancapiano
- " where c.forumInstance.id := forumInstanceId " +
- "order by c.order asc");
- query.setCacheable(true);
+ .getNamedQuery("findCategories");
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
return query.list();
@@ -386,14 +378,7 @@
throws ModuleException {
try {
Session session = getSession();
- Query query = session.createQuery(" select c "
- + " from CategoryImpl as c "
- + " left outer join fetch c.forums "
- // Luca Stancapiano
- + " where c.forumInstance.id = :forumInstanceId "
- + " order by c.order asc");
-
- query.setCacheable(true);
+ Query query = session.getNamedQuery("findCategoriesFetchForums");
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
List categoriesWithDuplicates = query.list();
@@ -417,10 +402,7 @@
try {
Session session = getSession();
Query query = session
- .createQuery("from ForumImpl as f " +
- // Luca Stancapiano
- "where f.forumInstance.id := forumInstanceId " +
- "order by f.order asc");
+ .getNamedQuery("findForums");
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
@@ -441,7 +423,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from ForumImpl as f where f.category=:categoryId order by f.order asc");
+ session.getNamedQuery("findForumsByCategoryId");
query.setString("categoryId",
categoryId.toString());
return query.list();
@@ -461,7 +443,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from TopicImpl as t where t.forum=:forumid and t.type = :type order by t.lastPostDate");
+ session.getNamedQuery("findAnnouncements");
query.setString("forumid", "" + forum.getId());
query.setString("type", "" + ForumsConstants.POST_ANNOUNCE);
return query.list();
@@ -481,9 +463,7 @@
public List findTopics(Integer indexInstance) throws ModuleException {
try {
Session session = getSession();
- Query query = session.createQuery("from TopicImpl as t " +
- // Luca Stancapiano
- "where t.forum.forumInstance.id := forumInstanceId "
+ Query query = session.getNamedQuery("findTopics"
);
// Luca Stancapiano
@@ -520,11 +500,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from TopicImpl as t " +
- "join fetch t.poster " +
- "where t.forum = :forumid " +
- "and t.type = :type " +
- "order by t.lastPostDate " + order);
+ session.getNamedQuery("findTopicsType"+order);
query.setFirstResult(start);
query.setMaxResults(perPage);
query.setString("forumid", "" + forum.getId());
@@ -563,10 +539,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from TopicImpl as t " +
- "join fetch t.poster " +
- "where t.forum = :forumid " +
- "order by t.lastPostDate " + order);
+ session.getNamedQuery("findTopicsForum"+order);
query.setFirstResult(start);
query.setMaxResults(perPage);
query.setString("forumid", "" + forum.getId());
@@ -642,10 +615,7 @@
//"SELECT OBJECT(t) FROM topic AS t WHERE t.replies > ?1 ORDER BY t.creationDate DESC LIMIT ?2"
Session session = getSession();
Query query = session
- .createQuery("from TopicImpl as t where t.replies > :replies "+
- // Luca Stancapiano
- "and t.forum.forumInstance.id := forumInstanceId "+
- "order by t.lastPostDate desc");
+ .getNamedQuery("findTopicsHot");
query.setMaxResults(limit);
query.setInteger("replies", replies);
// Luca Stancapiano
@@ -667,7 +637,7 @@
Query query =
// Luca Stancapiano
session
- .createQuery("from TopicImpl as t where t.forum.category.forumInstance.id = :forumInstanceId order by t.lastPostDate desc");
+ .getNamedQuery("findTopicsByLatestPosts");
query.setMaxResults(limit);
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
@@ -684,10 +654,7 @@
//"SELECT OBJECT(t) FROM topic AS t WHERE t.lastPostDate > ?1 ORDER BY t.replies DESC LIMIT ?2"
Session session = getSession();
Query query = session
- .createQuery("from TopicImpl as t where t.lastPostDate > :after "+
- // Luca Stancapiano
- "and t.forum.forumInstance.id := forumInstanceId "+
- "order by t.replies desc");
+ .getNamedQuery("findTopicsHottest");
query.setMaxResults(limit);
query.setDate("after", after);
// Luca Stancapiano
@@ -706,10 +673,7 @@
//"SELECT OBJECT(t) FROM topic AS t WHERE t.lastPostDate > ?1 ORDER BY t.views DESC LIMIT ?2"
Session session = getSession();
Query query = session
- .createQuery("from TopicImpl as t where t.lastPostDate > :after " +
- // Luca Stancapiano
- "and t.forum.forumInstance.id := forumInstanceId "+
- "order by t.viewCount desc");
+ .getNamedQuery("findTopicsMostViewed");
query.setMaxResults(limit);
query.setDate("after", after);
// Luca Stancapiano
@@ -739,7 +703,9 @@
Session session = getSession();
session.save(poster);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
session.save(poll);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
@@ -752,9 +718,9 @@
{
Attachment a = (Attachment)i.next();
session.save(a);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
post.addAttachment(a);
- }
- session.save(post);
+ }
TopicImpl topic = new TopicImpl();
topic.setSubject(message.getSubject());
@@ -772,12 +738,15 @@
session.save(topic);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
forum.addTopicSize();
forum.addPostSize();
- post.setTopic(topic);
+ post.setTopic(topic);
+ session.save(post);
notificationEngine.scheduleForNotification(post.getId(), NotificationEngine.MODE_POST);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
return post;
}
catch (HibernateException e)
@@ -822,6 +791,7 @@
session.save(topic);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
//forum.addTopicSize();
//forum.addPostSize();
@@ -865,6 +835,7 @@
session.save(post);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
topic.addPost(post);
//post.setTopic(topic);
@@ -876,6 +847,7 @@
//forum.setLastPost(post);
forum.addPostSize();
notificationEngine.scheduleForNotification(post.getId(), NotificationEngine.MODE_REPLY);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
return post;
}
catch (HibernateException e)
@@ -900,6 +872,7 @@
}
session.save(poll);
topic.setPoll(poll);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
return poll;
}
catch (HibernateException e)
@@ -921,7 +894,7 @@
Session session = getSession();
// Luca Stancapiano start
Query query = session
- .createQuery("select max(c.order) from CategoryImpl as c where c.forumInstanceId = :indexInstance");
+ .getNamedQuery("getLastCategoryOrder");
query.setParameter("forumInstanceId", indexInstance);
// Luca Stancapiano end
Integer lastCategoryOrder = (Integer) query.uniqueResult();
@@ -943,6 +916,7 @@
// Luca Stancapiano
category.setForumInstance(forumInstance);
session.save(category);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
return category;
} catch (HibernateException e) {
String errorMessage = "Cannot create topic";
@@ -960,6 +934,7 @@
{
//session.flush();
session.delete(category);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
//session.flush();
}
catch (HibernateException e)
@@ -987,6 +962,7 @@
session.delete(forum);
}
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
//session.flush();
}
catch (HibernateException e)
@@ -1014,6 +990,7 @@
{
session.delete(post);
}
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
}
catch (HibernateException e)
{
@@ -1033,6 +1010,7 @@
Poll poll = topic.getPoll();
topic.setPoll(null);
session.delete(poll);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
}
catch (HibernateException e)
@@ -1064,6 +1042,7 @@
{
session.delete(topic);
}
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
//session.flush();
}
catch (HibernateException e)
@@ -1080,7 +1059,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("select max(f.order) from ForumImpl as f where f.category = :categoryId");
+ session.getNamedQuery("getLastForumOrder");
query.setString("categoryId", "" + category.getId());
Integer lastForumOrder = (Integer)query.uniqueResult();
return (lastForumOrder != null) ? lastForumOrder.intValue() : 0;
@@ -1107,6 +1086,7 @@
forum.setDescription(description);
forum.setOrder(getLastForumOrder(category) + 10);
session.save(forum);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
return forum;
}
catch (HibernateException e)
@@ -1155,7 +1135,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from TopicImpl as t where t.forum = :forumid");
+ session.getNamedQuery("findTopicsForumNoOrder");
query.setString("forumid", "" + forum.getId());
return query.list();
}
@@ -1181,10 +1161,7 @@
public List findPosts(Integer indexInstance) throws ModuleException {
try {
Session session = getSession();
- Query query = session.createQuery("from PostImpl "+
-
- // Luca Stancapiano
- "and t.forum.forumInstance.id := forumInstanceId"
+ Query query = session.getNamedQuery("findPosts"
);
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
@@ -1265,7 +1242,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from PostImpl as p where p.topic=:topicId order by p.createDate " + order);
+ session.getNamedQuery("findPostsByTopicId"+order);
query.setString("topicId",
topicId.toString());
query.setFirstResult(start);
@@ -1296,11 +1273,7 @@
{
Session session = getSession();
Query query =
- session.createQuery(" from PostImpl as p " +
- " join fetch p.poster " +
- " left outer join fetch p.attachments " +
- " where p.id IN ( :postIds ) " +
- " order by p.createDate " + order);
+ session.getNamedQuery("findPostsByIdsFetchAttachmentsAndPosters"+order);
query.setParameterList("postIds",postIds);
Iterator it = query.list().iterator();
List list = new LinkedList();
@@ -1342,10 +1315,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("select p.id " +
- "from PostImpl as p " +
- "where p.topic=:topicId " +
- "order by p.createDate " + order);
+ session.getNamedQuery("findPostIds"+order);
query.setString("topicId", topicId.toString());
query.setFirstResult(start);
if (limit != 0)
@@ -1385,7 +1355,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from PostImpl as p where p.topic=:topicId");
+ session.getNamedQuery("findPostsByTopicIdNoOrder");
query.setString("topicId",
topicId.toString());
return query.list();
@@ -1438,7 +1408,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("select max(p.createDate) from PostImpl as p where p.poster.userId = :userId");
+ session.getNamedQuery("findLastPostDateForUser");
query.setString("userId", "" + user.getId().toString());
Date lastPostDate = (Date)query.uniqueResult();
return lastPostDate;
@@ -1459,16 +1429,9 @@
Query query =
// This is old query, considered as less efficient
- //session.createQuery("from PostImpl as p where p.topic.forum = :forumId order by p.createDate desc");
+ //session.getNamedQuery("from PostImpl as p where p.topic.forum = :forumId order by p.createDate desc");
- session.createQuery("select p " +
- "from PostImpl as p " +
- "join fetch p.poster " +
- "where p.createDate = ( " +
- " select DISTINCT MAX(topic.lastPostDate) " +
- " from TopicImpl as topic " +
- " where topic.forum = :forumId " +
- ") " );
+ session.getNamedQuery("findLastPost" );
query.setString("forumId", "" + forum.getId());
query.setFirstResult(0);
query.setMaxResults(1);
@@ -1490,13 +1453,9 @@
Session session = getSession();
Query query =
// Old query considered as inefficient
- //session.createQuery("from PostImpl as p where p.topic = :topicId order by p.createDate desc");
+ //session.getNamedQuery("from PostImpl as p where p.topic = :topicId order by p.createDate desc");
- session.createQuery("select p " +
- "from PostImpl as p " +
- "join fetch p.poster " +
- "where p.topic = :topicId " +
- "AND p.createDate = :lastPostDate ");
+ session.getNamedQuery("findFirstPost");
query.setDate("lastPostDate", topic.getLastPostDate());
query.setString("topicId", "" + topic.getId());
query.setFirstResult(0);
@@ -1518,7 +1477,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("from PostImpl as p where p.topic = :topicId order by p.createDate desc");
+ session.getNamedQuery("findLastPostOrder");
query.setString("topicId", "" + topic.getId());
query.setFirstResult(0);
query.setMaxResults(1);
@@ -1540,10 +1499,8 @@
Session session = getSession();
//Query query =
// Old query considered as inefficient
- //session.createQuery("from PostImpl as p where p.topic = :topicId order by p.createDate desc");
- session.createQuery("select topic.lastPostDate as maxDate , topic.id " +
- "from TopicImpl as topic " +
- "where topic.forum.id = :forumId ");
+ //session.getNamedQuery("from PostImpl as p where p.topic = :topicId order by p.createDate desc");
+ session.getNamedQuery("findLastPostsOfTopics");
Iterator it = topics.iterator();
List lastPostDates = new ArrayList(topics.size());
List dates = new LinkedList();
@@ -1558,11 +1515,7 @@
return new HashMap(0);
}
- Query query = session.createQuery("select post.createDate, post " +
- "from PostImpl as post " +
- "join fetch post.poster " +
- "where post.createDate IN (:dates) " +
- "order by post.createDate ");
+ Query query = session.getNamedQuery("findLastPostsOfTopicsCreateDate");
query.setParameterList("dates",dates);
List posts = query.list();
Map forumPostMap = new HashMap(dates.size());
@@ -1607,12 +1560,7 @@
{
Session session = getSession();
Query query =
- session.createQuery("select MAX(topic.lastPostDate) as maxDate , topic.forum.id " +
- "from TopicImpl as topic " +
- // Luca Stancapiano
- "where topic.forum.category.forumInstance.id = :forumInstanceId " +
- "group by topic.forum.id ");
- query.setCacheable(true);
+ session.getNamedQuery("findLastPostsOfForums");
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
List createDates = query.list();
@@ -1627,12 +1575,7 @@
return new HashMap(0);
}
- query = session.createQuery("select post.createDate, post " +
- "from PostImpl as post " +
- "join fetch post.poster " +
- "where post.createDate IN (:dates) " +
- "order by post.createDate ");
- query.setCacheable(true);
+ query = session.getNamedQuery("findLastPostsOfForumsCreateDate");
query.setParameterList("dates",dates);
List posts = query.list();
Map forumPostMap = new HashMap(createDates.size());
@@ -1671,9 +1614,7 @@
{
Session session = getSession();
Query query = session
- .createQuery("from ForumWatchImpl as f where f.poster.userId = :userId " +
- // Luca Stancapiano
- "and f.forum.category.forumInstance.id = :forumInstanceId"
+ .getNamedQuery("findForumWatchByUser"
);
query.setString("userId", user.getId().toString());
// Luca Stancapiano
@@ -1693,12 +1634,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("select f "
- + "from ForumImpl as f " + "where f.id IN ( "
- + " select fw.forum.id " + " from ForumWatchImpl fw "
- + " where fw.poster.userId = :userId ) "
- // Luca Stancapiano
- + "and f.category.forumInstance.id = :forumInstanceId ");
+ Query query = session.getNamedQuery("findForumWatchedByUser");
query.setString("userId", user.getId().toString());
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
@@ -1717,13 +1653,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("select t "
- + "from TopicImpl as t " + "where t.id IN ( "
- + " select tw.topic.id " + " from TopicWatchImpl tw "
- + " where tw.poster.userId = :userId ) "
- // Luca Stancapiano
- + "and t.forum.category.forumInstance.id = :forumInstanceId "
- + "order by t.lastPostDate desc ");
+ Query query = session.getNamedQuery("findTopicWatchedByUser");
query.setString("userId", user.getId().toString());
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
@@ -1742,14 +1672,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("select t "
- + "from TopicImpl as t " + "where t.id IN ( "
- + " select tw.topic.id " + " from TopicWatchImpl tw "
- + " where tw.poster.userId = :userId ) "
- + "and (t.lastPostDate > :datePoint) "
- // Luca Stancapiano
- + "and t.forum.category.forumInstance.id = :forumInstanceId "
- + "order by t.lastPostDate desc ");
+ Query query = session.getNamedQuery("findTopicWatchedByUser");
query.setString("userId", user.getId().toString());
query.setTimestamp("datePoint", datePoint);
// Luca Stancapiano
@@ -1778,11 +1701,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("select tw.topic.id , tw "
- + "from TopicWatchImpl tw "
- + "where tw.poster.userId = :userId "
- // Luca Stancapiano
- + "and t.forum.category.forumInstance.id = :forumInstanceId "
+ Query query = session.getNamedQuery("findTopicWatches"
);
query.setString("userId", user.getId().toString());
// Luca Stancapiano
@@ -1813,8 +1732,7 @@
{
Session session = getSession();
Query query = session
- .createQuery("select p from TopicImpl as t join t.posts as p where t.forum.id = :forumId order by p.createDate "
- + order);
+ .getNamedQuery("findPostsFromForum"+order);
query.setString("forumId", forum.getId().toString());
@@ -1852,8 +1770,7 @@
{
Session session = getSession();
Query query = session
- .createQuery("select p from ForumImpl as f join f.topics as t join t.posts as p where f.category.id = :categoryId order by p.createDate "
- + order);
+ .getNamedQuery("findPostsFromCategory"+order);
query.setString("categoryId", category.getId().toString());
@@ -1890,9 +1807,7 @@
{
Session session = getSession();
Query query = session
- .createQuery("select p from PostImpl as p order by p.createDate "
- + order);
-
+ .getNamedQuery("findPostsOrder"+order);
query.setFirstResult(0);
if (limit != 0)
@@ -1941,6 +1856,7 @@
forumWatch.setForum(forum);
forumWatch.setMode(mode);
session.save(forumWatch);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
}
catch (HibernateException e)
@@ -1957,6 +1873,7 @@
try
{
session.delete(watch);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
}
catch (HibernateException e)
{
@@ -1972,7 +1889,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("from ForumWatchImpl as f where f.id = :forumWatchId");
+ Query query = session.getNamedQuery("findForumWatchById");
query.setString("forumWatchId",
forumWatchId.toString());
return (ForumWatch)query.uniqueResult();
@@ -2002,11 +1919,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("select fw.forum.id , fw " +
- "from ForumWatchImpl fw " +
- "where fw.poster.userId = :userId " +
- // Luca Stancapiano
- "and fw.forum.category.forumInstance.id = :forumInstanceId ");
+ Query query = session.getNamedQuery("findForumWatches");
query.setString("userId", user.getId().toString());
// Luca Stancapiano
query.setParameter("forumInstanceId", indexInstance);
@@ -2034,9 +1947,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery(" from ForumWatchImpl as fw " +
- " where fw.poster.userId = :userId " +
- " and fw.forum.id= :forumId ");
+ Query query = session.getNamedQuery("findForumWatchByUserAndForum");
query.setString("userId", user.getId().toString());
query.setInteger("forumId", forumId );
Object obj = query.uniqueResult();
@@ -2059,9 +1970,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery(" from TopicWatchImpl as tw " +
- " where tw.poster.userId = :userId " +
- " and tw.topic.id= :topicId ");
+ Query query = session.getNamedQuery("findTopicWatchByUserAndTopic");
query.setString("userId", user.getId().toString());
query.setInteger("topicId", topicId );
Object obj = query.uniqueResult();
@@ -2097,12 +2006,14 @@
}
session.save(poster);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
TopicWatch topicWatch = new TopicWatchImpl();
topicWatch.setPoster(poster);
topicWatch.setTopic(topic);
topicWatch.setMode(mode);
session.save(topicWatch);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
}
catch (HibernateException e)
{
@@ -2118,7 +2029,7 @@
try
{
Session session = getSession();
- Query query = session.createQuery("from TopicWatchImpl as f where f.id = :topicWatchId");
+ Query query = session.getNamedQuery("findTopicWatchById");
query.setString("topicWatchId",
topicWatchId.toString());
return (TopicWatch)query.uniqueResult();
@@ -2190,6 +2101,7 @@
forumInstance.setId(indexInstance);
forumInstance.setName(name);
session.save(forumInstance);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
return forumInstance;
} catch (HibernateException e) {
String errorMessage = "Cannot create forum Instance";
@@ -2204,6 +2116,7 @@
try {
// session.flush();
session.delete(forumInstance);
+ session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
// session.flush();
} catch (HibernateException e) {
String errorMessage = "Cannot delete forum Instance";
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -35,7 +35,6 @@
private boolean signatureEnabled = true;
/**
- * @hibernate.property column="jbp_subject"
*/
public String getSubject()
{
@@ -53,8 +52,6 @@
}
/**
- * @hibernate.property column="jbp_text"
- * type="text"
*/
public String getText()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -21,7 +21,6 @@
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 916 $
- * @hibernate.class table="jbp_forums_polls"
*/
public class PollImpl
implements Serializable,
@@ -45,8 +44,6 @@
private Date creationDate;
/**
- * @hibernate.id column="jbp_poll_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -83,13 +80,6 @@
}
/**
- * @hibernate.list lazy="true"
- * cascade="all"
- * update="true"
- * table="jbp_forums_poll_option"
- * @hibernate.collection-key column="jbp_poll_id"
- * @hibernate.collection-index column="jbp_poll_option_position"
- * @hibernate.collection-composite-element class="org.jboss.portlet.forums.impl.PollOptionImpl"
*/
public List getOptions()
{
@@ -101,7 +91,6 @@
}
/**
- * @hibernate.property column="jbp_title"
*/
public String getTitle()
{
@@ -109,9 +98,6 @@
}
/**
- * @hibernate.property column="jbp_length"
- * unique="false"
- * update="true"
*/
public int getLength()
{
@@ -135,13 +121,6 @@
}*/
/**
- * @hibernate.set lazy="true"
- * cascade="all"
- * table="jbp_forums_poll_voted"
- * @hibernate.collection-key column="jbp_poll_id"
- * @hibernate.collection-element type="integer"
- * column="jbp_poll_voted"
- * not-null="true"
*/
public Set getVoted()
{
@@ -165,8 +144,6 @@
}
/**
- * @hibernate.property column="jbp_creation_date"
- * not-null="true"
*/
public Date getCreationDate()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -39,8 +39,6 @@
}
/**
- * @hibernate.property column="jbp_votes"
- * not-null="true"
*/
public int getVotes()
{
@@ -53,8 +51,6 @@
}
/**
- * @hibernate.property column="jbp_question"
- * not-null="true"
*/
public String getQuestion()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -27,8 +27,6 @@
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 2066 $
- * @hibernate.class table="jbp_forums_posts"
- * @hibernate.cache usage="read-write"
*/
public class PostImpl
implements Serializable,
@@ -53,8 +51,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_topic_id"
- * class="org.jboss.portlet.forums.impl.TopicImpl"
*/
public Topic getTopic()
{
@@ -92,9 +88,6 @@
}
/**
- * @hibernate.property column="jbp_edit_count"
- * unique="false"
- * update="true"
*/
public int getEditCount()
{
@@ -112,9 +105,6 @@
}
/**
- * @hibernate.property column="jbp_edit_date"
- * unique="false"
- * update="true"
*/
public Date getEditDate()
{
@@ -132,8 +122,6 @@
}
/**
- * @hibernate.id column="jbp_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -151,9 +139,6 @@
}
/**
- * @hibernate.property column="jbp_create_date"
- * unique="false"
- * update="false"
*/
public Date getCreateDate()
{
@@ -171,7 +156,6 @@
}
/**
- * @hibernate.component class="org.jboss.portlet.forums.impl.MessageImpl"
*/
public Message getMessage()
{
@@ -189,8 +173,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_poster_id"
- * class="org.jboss.portlet.forums.impl.PosterImpl"
*/
public Poster getPoster()
{
@@ -210,13 +192,6 @@
//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"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.AttachmentImpl"
*/
public List getAttachments()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -26,8 +26,6 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
* @version $Revision: 2811 $
- * @hibernate.class table="jbp_forums_posters"
- * @hibernate.cache usage="read-write"
*/
public class PosterImpl
implements Poster
@@ -87,8 +85,6 @@
/**
* @return Returns the id.
- * @hibernate.id column="jbp_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -107,8 +103,6 @@
* This column has the unique constraints as it reflects the user id.
*
* @return Returns the id.
- * @hibernate.property column="jbp_user_id"
- * unique="true"
*/
public String getUserId()
{
@@ -124,7 +118,6 @@
}
/**
- * @hibernate.property column="jbp_post_count"
*/
public int getPostCount()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -20,7 +20,6 @@
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 916 $
- * @hibernate.class table="jbp_forums_topics"
*/
public class TopicImpl
implements Serializable,
@@ -81,8 +80,6 @@
/**
- * @hibernate.id column="jbp_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -105,13 +102,6 @@
*/
/**
- * @hibernate.bag lazy="true"
- * cascade="all-delete-orphan"
- * order-by="jbp_create_date asc"
- * inverse="true"
- * table="jbp_forums_posts"
- * @hibernate.collection-key column="jbp_topic_id"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.PostImpl"
*/
public List getPosts()
{
@@ -141,8 +131,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_forum_id"
- * class="org.jboss.portlet.forums.impl.ForumImpl"
*/
public Forum getForum()
{
@@ -160,9 +148,6 @@
}
/**
- * @hibernate.property column="jbp_view_count"
- * unique="false"
- * update="true"
*/
public int getViewCount()
{
@@ -180,9 +165,6 @@
}
/**
- * @hibernate.property column="jbp_replies"
- * unique="false"
- * update="true"
*/
public int getReplies()
{
@@ -264,9 +246,6 @@
}
/**
- * @hibernate.property column="jbp_last_post_date"
- * unique="false"
- * update="true"
*/
public Date getLastPostDate()
{
@@ -295,8 +274,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_poster"
- * class="org.jboss.portlet.forums.impl.PosterImpl"
*/
public Poster getPoster()
{
@@ -314,9 +291,6 @@
}
/**
- * @hibernate.property column="jbp_type"
- * unique="false"
- * update="true"
*/
public int getType()
{
@@ -334,9 +308,6 @@
}
/**
- * @hibernate.property column="jbp_status"
- * unique="false"
- * update="true"
*/
public int getStatus()
{
@@ -374,9 +345,6 @@
}*/
/**
- * @hibernate.property column="jbp_subject"
- * unique="false"
- * update="true"
*/
public String getSubject()
{
@@ -394,11 +362,6 @@
}
/**
- * @hibernate.bag lazy="true"
- * inverse="true"
- * cascade="all"
- * @hibernate.collection-key column="jbp_topic_id"
- * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.TopicWatchImpl"
*/
public List getWatches()
{
@@ -411,9 +374,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_poll"
- * class="org.jboss.portlet.forums.impl.PollImpl"
- * not-null="false"
*/
public Poll getPoll()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -22,8 +22,6 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet </a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
* @version $Revision: 878 $
- * @hibernate.joined-subclass table="jbp_forums_topicswatch"
- * @hibernate.joined-subclass-key column="jbp_id"
*/
public class TopicWatchImpl
extends WatchImpl
@@ -41,8 +39,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_topic_id"
- * class="org.jboss.portlet.forums.impl.TopicImpl"
*/
public Topic getTopic()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -85,7 +85,6 @@
}
/**
- * @hibernate.property column="jbp_content_type"
*/
public String getContentType()
{
@@ -98,7 +97,6 @@
}
/**
- * @hibernate.property column="jbp_size"
*/
public long getSize()
{
@@ -111,8 +109,6 @@
}
/**
- * @hibernate.property column="jbp_name"
- * type="text"
*/
public String getName()
{
@@ -135,9 +131,6 @@
}
/**
- * @hibernate.property column="jbp_content"
- * type="blob"
- * length="100000000"
*/
public Blob getContent()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java 2008-02-07 18:47:59 UTC (rev 18391)
@@ -18,7 +18,6 @@
*
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 916 $
- * @hibernate.class table="jbp_forums_watch"
*/
public class WatchImpl implements Serializable, Watch
{
@@ -39,8 +38,6 @@
private Poster poster;
/**
- * @hibernate.id column="jbp_id"
- * generator-class="native"
*/
public Integer getId()
{
@@ -56,8 +53,6 @@
}
/**
- * @hibernate.many-to-one column="jbp_poster_id"
- * class="org.jboss.portlet.forums.impl.PosterImpl"
*/
public Poster getPoster()
{
@@ -70,9 +65,6 @@
}
/**
- * @hibernate.property column="jbp_mode"
- * unique="false"
- * update="true"
*/
public int getMode()
{
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -36,5 +36,7 @@
<mapping resource="org/jboss/portlet/forums/impl/TopicImpl.hbm.xml"/>
<mapping resource="org/jboss/portlet/forums/impl/WatchImpl.hbm.xml"/>
<mapping resource="org/jboss/portlet/forums/impl/AttachmentImpl.hbm.xml"/>
+ <!-- Luca Stancapiano - I add Queries to put off queries inside java code -->
+ <mapping resource="org/jboss/portlet/forums/impl/Queries.hbm.xml"/>
</session-factory>
</hibernate-configuration>
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt 2008-02-07 18:47:59 UTC (rev 18391)
@@ -68,10 +68,12 @@
// Luca Stancapiano start - I save ForumInstance record and all his children records
fii.addCategory(cat);
session.save(fii);
+ session.flush(); // Luca Stancapiano - it is required for clustering versions
// Luca Stancapiano end
//
session.save(cat);
+ session.flush(); // Luca Stancapiano - it is required for clustering versions
//session.save(forum1);
//session.save(forum2);
tx.commit();
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/AttachmentImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/AttachmentImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/AttachmentImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.AttachmentImpl"
+ table="jbp_forums_attachments"
+ >
+
+ <id
+ name="id"
+ column="jbp_attachment_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-AttachmentImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <property
+ name="comment"
+ type="text"
+ update="true"
+ insert="true"
+ column="jbp_comment"
+ />
+
+ <component
+ name="file"
+ class="org.jboss.portlet.forums.impl.UploadedFileImpl"
+ >
+ <property
+ name="contentType"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_content_type"
+ />
+
+ <property
+ name="size"
+ type="long"
+ update="true"
+ insert="true"
+ column="jbp_size"
+ />
+
+ <property
+ name="name"
+ type="text"
+ update="true"
+ insert="true"
+ column="jbp_name"
+ />
+
+ <property
+ name="content"
+ type="blob"
+ update="true"
+ insert="true"
+ column="jbp_content"
+ length="100000000"
+ />
+
+ </component>
+
+ <many-to-one
+ name="post"
+ class="org.jboss.portlet.forums.impl.PostImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_post_id"
+ />
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-AttachmentImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.CategoryImpl"
+ table="jbp_forums_categories"
+ >
+ <cache usage="read-write" />
+
+ <id
+ name="id"
+ column="jbp_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-CategoryImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <bag
+ name="forums"
+ table="jbp_forums_forums"
+ lazy="true"
+ inverse="true"
+ cascade="all-delete-orphan"
+ order-by="jbp_order asc"
+ >
+ <cache
+ usage="read-write"
+ />
+
+ <key
+ column="jbp_category_id"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.ForumImpl"
+ />
+
+ </bag>
+
+ <property
+ name="order"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_order"
+ unique="false"
+ />
+
+ <property
+ name="title"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_title"
+ unique="false"
+ />
+
+ <many-to-one
+ name="forumInstance"
+ class="org.jboss.portlet.forums.impl.ForumInstanceImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_forum_instance_id"
+ />
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-CategoryImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.ForumImpl"
+ table="jbp_forums_forums"
+ >
+ <cache usage="read-write" />
+
+ <id
+ name="id"
+ column="jbp_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-ForumImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <many-to-one
+ name="category"
+ class="org.jboss.portlet.forums.impl.CategoryImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_category_id"
+ />
+
+ <property
+ name="description"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_description"
+ unique="false"
+ />
+
+ <property
+ name="name"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_name"
+ unique="false"
+ />
+
+ <property
+ name="order"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_order"
+ unique="false"
+ />
+
+ <property
+ name="topicCount"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_topic_count"
+ unique="false"
+ />
+
+ <property
+ name="postCount"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_post_count"
+ unique="false"
+ />
+
+ <property
+ name="status"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_status"
+ unique="false"
+ />
+
+ <bag
+ name="topics"
+ table="jbp_forums_topics"
+ lazy="true"
+ inverse="true"
+ cascade="all-delete-orphan"
+ order-by="jbp_last_post_date asc"
+ >
+
+ <key
+ column="jbp_forum_id"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.TopicImpl"
+ />
+
+ </bag>
+
+ <bag
+ name="forumWatch"
+ lazy="true"
+ inverse="true"
+ cascade="all"
+ >
+
+ <key
+ column="jbp_forum_id"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.ForumWatchImpl"
+ />
+
+ </bag>
+
+ <bag
+ name="watches"
+ lazy="true"
+ inverse="true"
+ cascade="all"
+ >
+
+ <key
+ column="jbp_forum_id"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.ForumWatchImpl"
+ />
+
+ </bag>
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-ForumImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumInstanceImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumInstanceImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/ForumInstanceImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.ForumInstanceImpl"
+ table="jbp_forums_instances"
+ >
+
+ <id
+ name="id"
+ column="jbp_id"
+ type="java.lang.Integer"
+ >
+ <generator class="assigned">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-ForumInstanceImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <property
+ name="name"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_name"
+ unique="false"
+ />
+
+ <bag
+ name="categories"
+ table="jbp_forums_categories"
+ lazy="true"
+ inverse="true"
+ cascade="all-delete-orphan"
+ order-by="jbp_order"
+ >
+
+ <key
+ column="jbp_forum_instance_id"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.CategoryImpl"
+ />
+
+ </bag>
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-ForumInstanceImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.PollImpl"
+ table="jbp_forums_polls"
+ >
+
+ <id
+ name="id"
+ column="jbp_poll_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-PollImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <list
+ name="options"
+ table="jbp_forums_poll_option"
+ lazy="true"
+ cascade="all"
+ >
+
+ <key
+ column="jbp_poll_id"
+ >
+ </key>
+
+ <index
+ column="jbp_poll_option_position"
+ />
+
+ <composite-element
+ class="org.jboss.portlet.forums.impl.PollOptionImpl"
+ >
+ <property
+ name="votes"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_votes"
+ not-null="true"
+ />
+
+ <property
+ name="question"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_question"
+ not-null="true"
+ />
+
+ </composite-element>
+
+ </list>
+
+ <property
+ name="title"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_title"
+ />
+
+ <property
+ name="length"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_length"
+ unique="false"
+ />
+
+ <set
+ name="voted"
+ table="jbp_forums_poll_voted"
+ lazy="true"
+ cascade="all"
+ sort="unsorted"
+ >
+
+ <key
+ column="jbp_poll_id"
+ >
+ </key>
+
+ <element
+ column="jbp_poll_voted"
+ type="integer"
+ not-null="true"
+ unique="false"
+ />
+
+ </set>
+
+ <property
+ name="creationDate"
+ type="java.util.Date"
+ update="true"
+ insert="true"
+ column="jbp_creation_date"
+ not-null="true"
+ />
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-PollImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.PostImpl"
+ table="jbp_forums_posts"
+ >
+ <cache usage="read-write" />
+
+ <id
+ name="id"
+ column="jbp_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-PostImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <many-to-one
+ name="topic"
+ class="org.jboss.portlet.forums.impl.TopicImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_topic_id"
+ />
+
+ <property
+ name="editCount"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_edit_count"
+ unique="false"
+ />
+
+ <property
+ name="editDate"
+ type="java.util.Date"
+ update="true"
+ insert="true"
+ column="jbp_edit_date"
+ unique="false"
+ />
+
+ <property
+ name="createDate"
+ type="java.util.Date"
+ update="false"
+ insert="true"
+ column="jbp_create_date"
+ unique="false"
+ />
+
+ <component
+ name="message"
+ class="org.jboss.portlet.forums.impl.MessageImpl"
+ >
+ <property
+ name="subject"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_subject"
+ />
+
+ <property
+ name="text"
+ type="text"
+ update="true"
+ insert="true"
+ column="jbp_text"
+ />
+
+ </component>
+
+ <many-to-one
+ name="poster"
+ class="org.jboss.portlet.forums.impl.PosterImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_poster_id"
+ />
+
+ <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"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.AttachmentImpl"
+ />
+
+ </bag>
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-PostImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.PosterImpl"
+ table="jbp_forums_posters"
+ >
+ <cache usage="read-write" />
+
+ <id
+ name="id"
+ column="jbp_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-PosterImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <property
+ name="userId"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_user_id"
+ unique="true"
+ />
+
+ <property
+ name="postCount"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_post_count"
+ />
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-PosterImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/Queries.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+
+ <query name="findForumByIdFetchTopics"><![CDATA[select f
+ from ForumImpl f
+ left outer join fetch f.topics
+ where f.id = :forumId]]></query>
+
+ <query name="findCategoryByIdFetchForums"><![CDATA[from CategoryImpl as c
+ join fetch c.forums
+ where c.id=:categoryId]]></query>
+
+ <query name="findPosterByUserId"><![CDATA[from PosterImpl as u where u.userId=:userId]]></query>
+
+ <query name="findCategories" cacheable="true"><![CDATA[from CategoryImpl as c
+ where c.forumInstance.id = :forumInstanceId
+ order by c.order asc]]></query>
+
+ <query name="findCategoriesFetchForums" cacheable="true"><![CDATA[select c
+ from CategoryImpl as c
+ left outer join fetch c.forums
+ where c.forumInstance.id = :forumInstanceId
+ order by c.order asc]]></query>
+
+ <query name="findForums"><![CDATA[from ForumImpl as f
+ where f.category.forumInstance.id = :forumInstanceId
+ order by f.order asc]]></query>
+
+ <query name="findForumsByCategoryId"><![CDATA[from ForumImpl as f where f.category=:categoryId order by f.order asc]]></query>
+
+ <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 as t
+ where t.forum.category.forumInstance.id = :forumInstanceId]]></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
+ join fetch t.poster
+ where t.forum = :forumid
+ and t.type = :type
+ order by t.lastPostDate desc]]></query>
+
+ <query name="findTopicsForumasc"><![CDATA[from TopicImpl as t
+ join fetch t.poster
+ where t.forum = :forumid
+ order by t.lastPostDate asc]]></query>
+
+ <query name="findTopicsForumdesc"><![CDATA[from TopicImpl as t
+ join fetch t.poster
+ where t.forum = :forumid
+ order by t.lastPostDate desc]]></query>
+
+ <query name="findTopicsHot"><![CDATA[from TopicImpl as t where t.replies > :replies
+ and t.forum.category.forumInstance.id = :forumInstanceId
+ order by t.lastPostDate desc]]></query>
+
+ <query name="findTopicsByLatestPosts"><![CDATA[from TopicImpl as t where t.forum.category.forumInstance.id = :forumInstanceId order by t.lastPostDate desc]]></query>
+
+ <query name="findTopicsHottest"><![CDATA[from TopicImpl as t where t.lastPostDate > :after
+ and t.forum.category.forumInstance.id = :forumInstanceId
+ order by t.replies desc]]></query>
+
+ <query name="findTopicsMostViewed"><![CDATA[from TopicImpl as t where t.lastPostDate > :after
+ and t.forum.category.forumInstance.id = :forumInstanceId
+ order by t.viewCount desc]]></query>
+
+ <query name="getLastCategoryOrder"><![CDATA[select max(c.order) from CategoryImpl as c where c.forumInstance.id = :forumInstanceId]]></query>
+
+ <query name="getLastForumOrder"><![CDATA[select max(f.order) from ForumImpl as f where f.category = :categoryId]]></query>
+
+ <query name="findTopicsForumNoOrder"><![CDATA[from TopicImpl as t where t.forum = :forumid]]></query>
+
+ <query name="findPosts"><![CDATA[from PostImpl as p
+ where p.topic.forum.category.forumInstance.id = :forumInstanceId]]></query>
+
+ <query name="findPostsByTopicIdasc"><![CDATA[from PostImpl as p where p.topic=:topicId order by p.createDate asc]]></query>
+
+ <query name="findPostsByTopicIddesc"><![CDATA[from PostImpl as p where p.topic=:topicId order by p.createDate desc]]></query>
+
+ <query name="findPostsByIdsFetchAttachmentsAndPostersasc"><![CDATA[from PostImpl as p
+ join fetch p.poster
+ left outer join fetch p.attachments
+ where p.id IN ( :postIds )
+ order by p.createDate asc]]></query>
+
+ <query name="findPostsByIdsFetchAttachmentsAndPostersdesc"><![CDATA[from PostImpl as p
+ join fetch p.poster
+ left outer join fetch p.attachments
+ where p.id IN ( :postIds )
+ order by p.createDate desc]]></query>
+
+ <query name="findPostIdsasc"><![CDATA[select p.id
+ from PostImpl as p
+ where p.topic=:topicId
+ order by p.createDate asc]]></query>
+
+ <query name="findPostIdsdesc"><![CDATA[select p.id
+ from PostImpl as p
+ where p.topic=:topicId
+ order by p.createDate desc]]></query>
+
+ <query name="findPostsByTopicIdNoOrder"><![CDATA[from PostImpl as p where p.topic=:topicId]]></query>
+
+ <query name="findLastPostDateForUser"><![CDATA[select max(p.createDate) from PostImpl as p where p.poster.userId = :userId]]></query>
+
+ <query name="findLastPost"><![CDATA[select p
+ from PostImpl as p
+ join fetch p.poster
+ where p.createDate = (
+ select DISTINCT MAX(topic.lastPostDate)
+ from TopicImpl as topic
+ where topic.forum = :forumId
+ )]]></query>
+
+ <query name="findFirstPost"><![CDATA[select p
+ from PostImpl as p
+ join fetch p.poster
+ where p.topic = :topicId
+ AND p.createDate = :lastPostDate]]></query>
+
+ <query name="findLastPostOrder"><![CDATA[from PostImpl as p where p.topic = :topicId order by p.createDate desc]]></query>
+
+ <query name="findLastPostsOfTopics"><![CDATA[select topic.lastPostDate as maxDate , topic.id
+ from TopicImpl as topic
+ where topic.forum.id = :forumId]]></query>
+
+ <query name="findLastPostsOfTopicsCreateDate"><![CDATA[select post.createDate, post
+ from PostImpl as post
+ join fetch post.poster
+ where post.createDate IN (:dates)
+ order by post.createDate]]></query>
+
+ <query name="findLastPostsOfForums" cacheable="true"><![CDATA[select MAX(topic.lastPostDate) as maxDate , topic.forum.id
+ from TopicImpl as topic
+ where topic.forum.category.forumInstance.id = :forumInstanceId
+ group by topic.forum.id]]></query>
+
+ <query name="findLastPostsOfForumsCreateDate" cacheable="true"><![CDATA[select post.createDate, post
+ from PostImpl as post
+ join fetch post.poster
+ where post.createDate IN (:dates)
+ order by post.createDate]]></query>
+
+ <query name="findForumWatchByUser"><![CDATA[from ForumWatchImpl as f where f.poster.userId = :userId
+ and f.forum.category.forumInstance.id = :forumInstanceId]]></query>
+
+ <query name="findForumWatchedByUser"><![CDATA[select f
+ from ForumImpl as f where f.id IN (
+ select fw.forum.id from ForumWatchImpl fw
+ where fw.poster.userId = :userId )
+ and f.category.forumInstance.id = :forumInstanceId]]></query>
+
+ <query name="findTopicWatchedByUser"><![CDATA[select t
+ from TopicImpl as t where t.id IN (
+ select tw.topic.id from TopicWatchImpl tw
+ where tw.poster.userId = :userId )
+ and t.forum.category.forumInstance.id = :forumInstanceId
+ order by t.lastPostDate desc]]></query>
+
+ <query name="findTopicWatchedByUserCreateDate"><![CDATA[select t
+ from TopicImpl as t where t.id IN (
+ select tw.topic.id from TopicWatchImpl tw
+ where tw.poster.userId = :userId )
+ and (t.lastPostDate > :datePoint)
+ and t.forum.category.forumInstance.id = :forumInstanceId
+ order by t.lastPostDate desc]]></query>
+
+ <query name="findTopicWatches"><![CDATA[select tw.topic.id , tw
+ from TopicWatchImpl tw
+ where tw.poster.userId = :userId
+ and tw.topic.forum.category.forumInstance.id = :forumInstanceId]]></query>
+
+ <query name="findPostsFromForumasc"><![CDATA[select p from TopicImpl as t join t.posts as p where t.forum.id = :forumId order by p.createDate
+ asc]]></query>
+
+ <query name="findPostsFromForumdesc"><![CDATA[select p from TopicImpl as t join t.posts as p where t.forum.id = :forumId order by p.createDate
+ desc]]></query>
+
+ <query name="findPostsFromCategoryasc"><![CDATA[select p from ForumImpl as f join f.topics as t join t.posts as p where f.category.id = :categoryId order by p.createDate
+ asc]]></query>
+
+ <query name="findPostsFromCategorydesc"><![CDATA[select p from ForumImpl as f join f.topics as t join t.posts as p where f.category.id = :categoryId order by p.createDate
+ desc]]></query>
+
+ <query name="findPostsOrderasc"><![CDATA[select p from PostImpl as p order by p.createDate
+ asc]]></query>
+
+ <query name="findPostsOrderdesc"><![CDATA[select p from PostImpl as p order by p.createDate
+ desc]]></query>
+
+ <query name="findForumWatchById"><![CDATA[from ForumWatchImpl as f where f.id = :forumWatchId]]></query>
+
+ <query name="findForumWatches"><![CDATA[select fw.forum.id , fw
+ from ForumWatchImpl fw
+ where fw.poster.userId = :userId
+ and fw.forum.category.forumInstance.id = :forumInstanceId]]></query>
+
+ <query name="findForumWatchByUserAndForum"><![CDATA[from ForumWatchImpl as fw
+ where fw.poster.userId = :userId
+ and fw.forum.id= :forumId]]></query>
+
+ <query name="findTopicWatchByUserAndTopic"><![CDATA[from TopicWatchImpl as tw
+ where tw.poster.userId = :userId
+ and tw.topic.id= :topicId]]></query>
+
+ <query name="findTopicWatchById"><![CDATA[from TopicWatchImpl as f where f.id = :topicWatchId]]></query>
+
+
+</hibernate-mapping>
\ No newline at end of file
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.TopicImpl"
+ table="jbp_forums_topics"
+ >
+
+ <id
+ name="id"
+ column="jbp_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-TopicImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <bag
+ name="posts"
+ table="jbp_forums_posts"
+ lazy="true"
+ inverse="true"
+ cascade="all-delete-orphan"
+ order-by="jbp_create_date asc"
+ >
+
+ <key
+ column="jbp_topic_id"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.PostImpl"
+ />
+
+ </bag>
+
+ <many-to-one
+ name="forum"
+ class="org.jboss.portlet.forums.impl.ForumImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_forum_id"
+ />
+
+ <property
+ name="viewCount"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_view_count"
+ unique="false"
+ />
+
+ <property
+ name="replies"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_replies"
+ unique="false"
+ />
+
+ <property
+ name="lastPostDate"
+ type="java.util.Date"
+ update="true"
+ insert="true"
+ column="jbp_last_post_date"
+ unique="false"
+ />
+
+ <many-to-one
+ name="poster"
+ class="org.jboss.portlet.forums.impl.PosterImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_poster"
+ />
+
+ <property
+ name="type"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_type"
+ unique="false"
+ />
+
+ <property
+ name="status"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_status"
+ unique="false"
+ />
+
+ <property
+ name="subject"
+ type="java.lang.String"
+ update="true"
+ insert="true"
+ column="jbp_subject"
+ unique="false"
+ />
+
+ <bag
+ name="watches"
+ lazy="true"
+ inverse="true"
+ cascade="all"
+ >
+
+ <key
+ column="jbp_topic_id"
+ >
+ </key>
+
+ <one-to-many
+ class="org.jboss.portlet.forums.impl.TopicWatchImpl"
+ />
+
+ </bag>
+
+ <many-to-one
+ name="poll"
+ class="org.jboss.portlet.forums.impl.PollImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_poll"
+ not-null="false"
+ />
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-TopicImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+ <class
+ name="org.jboss.portlet.forums.impl.WatchImpl"
+ table="jbp_forums_watch"
+ >
+
+ <id
+ name="id"
+ column="jbp_id"
+ type="java.lang.Integer"
+ >
+ <generator class="native">
+ <!--
+ To add non XDoclet generator parameters, create a file named
+ hibernate-generator-params-WatchImpl.xml
+ containing the additional parameters and place it in your merge dir.
+ -->
+ </generator>
+ </id>
+
+ <many-to-one
+ name="poster"
+ class="org.jboss.portlet.forums.impl.PosterImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_poster_id"
+ />
+
+ <property
+ name="mode"
+ type="int"
+ update="true"
+ insert="true"
+ column="jbp_mode"
+ unique="false"
+ />
+
+ <!--
+ To add non XDoclet property mappings, create a file named
+ hibernate-properties-WatchImpl.xml
+ containing the additional properties and place it in your merge dir.
+ -->
+
+ <joined-subclass
+ name="org.jboss.portlet.forums.impl.TopicWatchImpl"
+ table="jbp_forums_topicswatch"
+ >
+ <key
+ column="jbp_id"
+ />
+
+ <many-to-one
+ name="topic"
+ class="org.jboss.portlet.forums.impl.TopicImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_topic_id"
+ />
+
+ </joined-subclass>
+ <joined-subclass
+ name="org.jboss.portlet.forums.impl.ForumWatchImpl"
+ table="jbp_forums_forumswatch"
+ >
+ <key
+ column="jbp_id"
+ />
+
+ <many-to-one
+ name="forum"
+ class="org.jboss.portlet.forums.impl.ForumImpl"
+ cascade="none"
+ outer-join="auto"
+ update="true"
+ insert="true"
+ column="jbp_forum_id"
+ />
+
+ </joined-subclass>
+
+ </class>
+
+</hibernate-mapping>
Added: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/component-info.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/component-info.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/component-info.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,20 @@
+<project name="jboss-cache-component-info">
+
+ <!-- ============================================================ -->
+ <!-- jboss/cache -->
+ <!-- ============================================================ -->
+
+ <component id="jboss/cache"
+ version="1.4.1.SP5"
+ licenseType="lgpl"
+ projectHome="http://www.jboss.org/products/jbosscache"
+ description="JBoss Cache is a product designed to cache
+ frequently accessed Java objects in order to dramatically improve
+ the performance of e-business applications."
+ >
+ <artifact id="jboss-cache-jdk50.jar"/>
+ <export>
+ <include input="jboss-cache-jdk50.jar"/>
+ </export>
+ </component>
+</project>
Property changes on: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/component-info.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/lib/jboss-cache-jdk50.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-cache/lib/jboss-cache-jdk50.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/README.txt
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/README.txt 2008-02-07 18:40:47 UTC (rev 18390)
+++ labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/README.txt 2008-02-07 18:47:59 UTC (rev 18391)
@@ -7,7 +7,7 @@
odmg-3.0.jar
licence : LGPL
-hibernate-3.1.beta2.jar
+hibernate-3.2.4.SP1_CP.jar
licence : LGPL
commons-collections-2.1.1.jar
Deleted: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/lib/hibernate.jar
===================================================================
(Binary files differ)
Added: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/lib/hibernate3.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/multipleforums110P26/thirdparty/jboss-hibernate/lib/hibernate3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/component-info.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/component-info.xml (rev 0)
+++ labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/component-info.xml 2008-02-07 18:47:59 UTC (rev 18391)
@@ -0,0 +1,15 @@
+<project name="jgroups-component-info">
+
+ <component id="jgroups"
+ licenseType="lgpl"
+ version="2.4.1.SP4"
+ projectHome="http://www.jgroups.org"
+ description="JGroups is a toolkit for reliable multicast communication">
+
+ <artifact id="jgroups.jar"/>
+
+ <export>
+ <include input="jgroups.jar"/>
+ </export>
+ </component>
+</project>
\ No newline at end of file
Property changes on: labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/component-info.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/lib/jgroups.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/multipleforums110P26/thirdparty/jgroups/lib/jgroups.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-svn-commits
mailing list