LPS-2991

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@29912 05bdf26c-840f-0410-9ced-eb539d925f36
liferay · Apr 20, 2009 · b0a3d67 · b0a3d67
1 parent 1860f33
commit b0a3d67
Show file tree

Hide file tree

Showing 41 changed files with 1,472 additions and 620 deletions.
diff --git a/portal-impl/src/META-INF/portal-hbm.xml b/portal-impl/src/META-INF/portal-hbm.xml
@@ -1066,6 +1066,7 @@
 			<generator class="assigned" />
 		</id>
 		<property name="userId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
+		<property name="threadId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property name="messageId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property name="flag" type="com.liferay.portal.dao.orm.hibernate.IntegerType" />
 	</class>

diff --git a/portal-impl/src/META-INF/portal-model-hints.xml b/portal-impl/src/META-INF/portal-model-hints.xml
@@ -1170,6 +1170,7 @@
 	<model name="com.liferay.portlet.messageboards.model.MBMessageFlag">
 		<field name="messageFlagId" type="long" />
 		<field name="userId" type="long" />
+		<field name="threadId" type="long" />
 		<field name="messageId" type="long" />
 		<field name="flag" type="int" />
 	</model>

diff --git a/portal-impl/src/META-INF/portal-spring.xml b/portal-impl/src/META-INF/portal-spring.xml
@@ -1325,10 +1325,6 @@
 	<bean id="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagUtil" class="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagUtil">
 		<property name="persistence" ref="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence.impl" />
 	</bean>
-	<bean id="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl" class="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinderImpl" parent="basePersistence" />
-	<bean id="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinderUtil" class="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinderUtil">
-		<property name="finder" ref="com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl" />
-	</bean>
 	<bean id="com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl" class="com.liferay.portlet.messageboards.service.impl.MBStatsUserLocalServiceImpl" />
 	<bean id="com.liferay.portlet.messageboards.service.MBStatsUserLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" parent="baseVelocityService">
 		<property name="target" ref="com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl" />

diff --git a/portal-impl/src/com/liferay/portal/service/base/UserLocalServiceBaseImpl.java b/portal-impl/src/com/liferay/portal/service/base/UserLocalServiceBaseImpl.java
@@ -181,7 +181,6 @@
 import com.liferay.portlet.messageboards.service.MBMessageFlagService;
 import com.liferay.portlet.messageboards.service.MBStatsUserLocalService;
 import com.liferay.portlet.messageboards.service.persistence.MBBanPersistence;
-import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence;
 import com.liferay.portlet.shopping.service.ShoppingCartLocalService;
@@ -1539,14 +1538,6 @@ public void setMBMessageFlagPersistence(
 		this.mbMessageFlagPersistence = mbMessageFlagPersistence;
 	}
 
-	public MBMessageFlagFinder getMBMessageFlagFinder() {
-		return mbMessageFlagFinder;
-	}
-
-	public void setMBMessageFlagFinder(MBMessageFlagFinder mbMessageFlagFinder) {
-		this.mbMessageFlagFinder = mbMessageFlagFinder;
-	}
-
 	public MBStatsUserLocalService getMBStatsUserLocalService() {
 		return mbStatsUserLocalService;
 	}
@@ -1964,8 +1955,6 @@ public void setTagsAssetFinder(TagsAssetFinder tagsAssetFinder) {
 	protected MBMessageFlagService mbMessageFlagService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence.impl")
 	protected MBMessageFlagPersistence mbMessageFlagPersistence;
-	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl")
-	protected MBMessageFlagFinder mbMessageFlagFinder;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl")
 	protected MBStatsUserLocalService mbStatsUserLocalService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence.impl")

diff --git a/portal-impl/src/com/liferay/portal/service/base/UserServiceBaseImpl.java b/portal-impl/src/com/liferay/portal/service/base/UserServiceBaseImpl.java
@@ -177,7 +177,6 @@
 import com.liferay.portlet.messageboards.service.MBMessageFlagService;
 import com.liferay.portlet.messageboards.service.MBStatsUserLocalService;
 import com.liferay.portlet.messageboards.service.persistence.MBBanPersistence;
-import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence;
 import com.liferay.portlet.shopping.service.ShoppingCartLocalService;
@@ -1482,14 +1481,6 @@ public void setMBMessageFlagPersistence(
 		this.mbMessageFlagPersistence = mbMessageFlagPersistence;
 	}
 
-	public MBMessageFlagFinder getMBMessageFlagFinder() {
-		return mbMessageFlagFinder;
-	}
-
-	public void setMBMessageFlagFinder(MBMessageFlagFinder mbMessageFlagFinder) {
-		this.mbMessageFlagFinder = mbMessageFlagFinder;
-	}
-
 	public MBStatsUserLocalService getMBStatsUserLocalService() {
 		return mbStatsUserLocalService;
 	}
@@ -1907,8 +1898,6 @@ public void setTagsAssetFinder(TagsAssetFinder tagsAssetFinder) {
 	protected MBMessageFlagService mbMessageFlagService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence.impl")
 	protected MBMessageFlagPersistence mbMessageFlagPersistence;
-	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl")
-	protected MBMessageFlagFinder mbMessageFlagFinder;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl")
 	protected MBStatsUserLocalService mbStatsUserLocalService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence.impl")

diff --git a/portal-impl/src/com/liferay/portal/upgrade/v5_2_3/UpgradeMessageBoards.java b/portal-impl/src/com/liferay/portal/upgrade/v5_2_3/UpgradeMessageBoards.java
@@ -55,7 +55,7 @@ public void upgrade() throws UpgradeException {
 
 	protected void doUpgrade() throws Exception {
 		updateGroupId();
-		updatePriority();
+		updateMessagePriority();
 	}
 
 	protected void updateGroupId() throws Exception {
@@ -99,7 +99,45 @@ protected void updateGroupId() throws Exception {
 		}
 	}
 
-	protected void updatePriority() throws Exception {
+	protected void updateMessageFlagThreadId() throws Exception {
+		if (isSupportsUpdateWithInnerJoin()) {
+			StringBuilder sb = new StringBuilder();
+
+			sb.append("update MBMessageFlag inner join MBMessage on ");
+			sb.append("MBMessage.messageId = MBMessageFlag.messageId set ");
+			sb.append("MBMessageFlag.threadId = MBMessage.threadId");
+
+			runSQL(sb.toString());
+		}
+		else {
+			Connection con = null;
+			PreparedStatement ps = null;
+			ResultSet rs = null;
+
+			try {
+				con = DataAccess.getConnection();
+
+				ps = con.prepareStatement(
+					"select messageId, threadId from MBMessage");
+
+				rs = ps.executeQuery();
+
+				while (rs.next()) {
+					long messageId = rs.getLong("messageId");
+					long threadId = rs.getLong("threadId");
+
+					runSQL(
+						"update MBMessageFlag set threadId = " + threadId +
+							" where messageId = " + messageId);
+				}
+			}
+			finally {
+				DataAccess.cleanUp(con, ps, rs);
+			}
+		}
+	}
+
+	protected void updateMessagePriority() throws Exception {
 		if (isSupportsUpdateWithInnerJoin()) {
 			StringBuilder sb = new StringBuilder();
 

diff --git a/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBMessageFlagModelImpl.java b/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBMessageFlagModelImpl.java
@@ -69,12 +69,15 @@ public class MBMessageFlagModelImpl extends BaseModelImpl<MBMessageFlag> {
 			{ "userId", new Integer(Types.BIGINT) },
 
 
+			{ "threadId", new Integer(Types.BIGINT) },
+
+
 			{ "messageId", new Integer(Types.BIGINT) },
 
 
 			{ "flag", new Integer(Types.INTEGER) }
 		};
-	public static final String TABLE_SQL_CREATE = "create table MBMessageFlag (messageFlagId LONG not null primary key,userId LONG,messageId LONG,flag INTEGER)";
+	public static final String TABLE_SQL_CREATE = "create table MBMessageFlag (messageFlagId LONG not null primary key,userId LONG,threadId LONG,messageId LONG,flag INTEGER)";
 	public static final String TABLE_SQL_DROP = "drop table MBMessageFlag";
 	public static final String DATA_SOURCE = "liferayDataSource";
 	public static final String SESSION_FACTORY = "liferaySessionFactory";
@@ -91,6 +94,7 @@ public static MBMessageFlag toModel(MBMessageFlagSoap soapModel) {
 
 		model.setMessageFlagId(soapModel.getMessageFlagId());
 		model.setUserId(soapModel.getUserId());
+		model.setThreadId(soapModel.getThreadId());
 		model.setMessageId(soapModel.getMessageId());
 		model.setFlag(soapModel.getFlag());
 
@@ -151,6 +155,14 @@ public long getOriginalUserId() {
 		return _originalUserId;
 	}
 
+	public long getThreadId() {
+		return _threadId;
+	}
+
+	public void setThreadId(long threadId) {
+		_threadId = threadId;
+	}
+
 	public long getMessageId() {
 		return _messageId;
 	}
@@ -199,6 +211,7 @@ public MBMessageFlag toEscapedModel() {
 
 			model.setMessageFlagId(getMessageFlagId());
 			model.setUserId(getUserId());
+			model.setThreadId(getThreadId());
 			model.setMessageId(getMessageId());
 			model.setFlag(getFlag());
 
@@ -224,6 +237,7 @@ public Object clone() {
 
 		clone.setMessageFlagId(getMessageFlagId());
 		clone.setUserId(getUserId());
+		clone.setThreadId(getThreadId());
 		clone.setMessageId(getMessageId());
 		clone.setFlag(getFlag());
 
@@ -276,6 +290,7 @@ public int hashCode() {
 	private long _userId;
 	private long _originalUserId;
 	private boolean _setOriginalUserId;
+	private long _threadId;
 	private long _messageId;
 	private long _originalMessageId;
 	private boolean _setOriginalMessageId;

diff --git a/portal-impl/src/com/liferay/portlet/messageboards/service.xml b/portal-impl/src/com/liferay/portlet/messageboards/service.xml
@@ -274,6 +274,7 @@
 
 		<!-- Other fields -->
 
+		<column name="threadId" type="long" />
 		<column name="messageId" type="long" />
 		<column name="flag" type="int" />
 
@@ -282,13 +283,25 @@
 		<finder name="UserId" return-type="Collection">
 			<finder-column name="userId" />
 		</finder>
+		<finder name="ThreadId" return-type="Collection">
+			<finder-column name="threadId" />
+		</finder>
 		<finder name="MessageId" return-type="Collection">
 			<finder-column name="messageId" />
 		</finder>
+		<finder name="T_F" return-type="Collection">
+			<finder-column name="threadId" />
+			<finder-column name="flag" />
+		</finder>
 		<finder name="M_F" return-type="Collection">
 			<finder-column name="messageId" />
 			<finder-column name="flag" />
 		</finder>
+		<finder name="U_T_F" return-type="Collection">
+			<finder-column name="userId" />
+			<finder-column name="threadId" />
+			<finder-column name="flag" />
+		</finder>
 		<finder name="U_M_F" return-type="MBMessageFlag" unique="true">
 			<finder-column name="userId" />
 			<finder-column name="messageId" />

diff --git a/...al-impl/src/com/liferay/portlet/messageboards/service/base/MBBanLocalServiceBaseImpl.java b/...al-impl/src/com/liferay/portlet/messageboards/service/base/MBBanLocalServiceBaseImpl.java
@@ -54,7 +54,6 @@
 import com.liferay.portlet.messageboards.service.persistence.MBDiscussionPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMailingListPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFinder;
-import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessagePersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence;
@@ -278,14 +277,6 @@ public void setMBMessageFlagPersistence(
 		this.mbMessageFlagPersistence = mbMessageFlagPersistence;
 	}
 
-	public MBMessageFlagFinder getMBMessageFlagFinder() {
-		return mbMessageFlagFinder;
-	}
-
-	public void setMBMessageFlagFinder(MBMessageFlagFinder mbMessageFlagFinder) {
-		this.mbMessageFlagFinder = mbMessageFlagFinder;
-	}
-
 	public MBStatsUserLocalService getMBStatsUserLocalService() {
 		return mbStatsUserLocalService;
 	}
@@ -421,8 +412,6 @@ public void setUserFinder(UserFinder userFinder) {
 	protected MBMessageFlagService mbMessageFlagService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence.impl")
 	protected MBMessageFlagPersistence mbMessageFlagPersistence;
-	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl")
-	protected MBMessageFlagFinder mbMessageFlagFinder;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl")
 	protected MBStatsUserLocalService mbStatsUserLocalService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence.impl")

diff --git a/portal-impl/src/com/liferay/portlet/messageboards/service/base/MBBanServiceBaseImpl.java b/portal-impl/src/com/liferay/portlet/messageboards/service/base/MBBanServiceBaseImpl.java
@@ -51,7 +51,6 @@
 import com.liferay.portlet.messageboards.service.persistence.MBDiscussionPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMailingListPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFinder;
-import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessagePersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence;
@@ -221,14 +220,6 @@ public void setMBMessageFlagPersistence(
 		this.mbMessageFlagPersistence = mbMessageFlagPersistence;
 	}
 
-	public MBMessageFlagFinder getMBMessageFlagFinder() {
-		return mbMessageFlagFinder;
-	}
-
-	public void setMBMessageFlagFinder(MBMessageFlagFinder mbMessageFlagFinder) {
-		this.mbMessageFlagFinder = mbMessageFlagFinder;
-	}
-
 	public MBStatsUserLocalService getMBStatsUserLocalService() {
 		return mbStatsUserLocalService;
 	}
@@ -364,8 +355,6 @@ public void setUserFinder(UserFinder userFinder) {
 	protected MBMessageFlagService mbMessageFlagService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence.impl")
 	protected MBMessageFlagPersistence mbMessageFlagPersistence;
-	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl")
-	protected MBMessageFlagFinder mbMessageFlagFinder;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl")
 	protected MBStatsUserLocalService mbStatsUserLocalService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence.impl")

diff --git a/...pl/src/com/liferay/portlet/messageboards/service/base/MBCategoryLocalServiceBaseImpl.java b/...pl/src/com/liferay/portlet/messageboards/service/base/MBCategoryLocalServiceBaseImpl.java
@@ -60,7 +60,6 @@
 import com.liferay.portlet.messageboards.service.persistence.MBDiscussionPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMailingListPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFinder;
-import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessagePersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence;
@@ -296,14 +295,6 @@ public void setMBMessageFlagPersistence(
 		this.mbMessageFlagPersistence = mbMessageFlagPersistence;
 	}
 
-	public MBMessageFlagFinder getMBMessageFlagFinder() {
-		return mbMessageFlagFinder;
-	}
-
-	public void setMBMessageFlagFinder(MBMessageFlagFinder mbMessageFlagFinder) {
-		this.mbMessageFlagFinder = mbMessageFlagFinder;
-	}
-
 	public MBStatsUserLocalService getMBStatsUserLocalService() {
 		return mbStatsUserLocalService;
 	}
@@ -524,8 +515,6 @@ public void setTagsEntryFinder(TagsEntryFinder tagsEntryFinder) {
 	protected MBMessageFlagService mbMessageFlagService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence.impl")
 	protected MBMessageFlagPersistence mbMessageFlagPersistence;
-	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl")
-	protected MBMessageFlagFinder mbMessageFlagFinder;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl")
 	protected MBStatsUserLocalService mbStatsUserLocalService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence.impl")

diff --git a/...al-impl/src/com/liferay/portlet/messageboards/service/base/MBCategoryServiceBaseImpl.java b/...al-impl/src/com/liferay/portlet/messageboards/service/base/MBCategoryServiceBaseImpl.java
@@ -57,7 +57,6 @@
 import com.liferay.portlet.messageboards.service.persistence.MBDiscussionPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMailingListPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFinder;
-import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder;
 import com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBMessagePersistence;
 import com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence;
@@ -231,14 +230,6 @@ public void setMBMessageFlagPersistence(
 		this.mbMessageFlagPersistence = mbMessageFlagPersistence;
 	}
 
-	public MBMessageFlagFinder getMBMessageFlagFinder() {
-		return mbMessageFlagFinder;
-	}
-
-	public void setMBMessageFlagFinder(MBMessageFlagFinder mbMessageFlagFinder) {
-		this.mbMessageFlagFinder = mbMessageFlagFinder;
-	}
-
 	public MBStatsUserLocalService getMBStatsUserLocalService() {
 		return mbStatsUserLocalService;
 	}
@@ -459,8 +450,6 @@ public void setTagsEntryFinder(TagsEntryFinder tagsEntryFinder) {
 	protected MBMessageFlagService mbMessageFlagService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagPersistence.impl")
 	protected MBMessageFlagPersistence mbMessageFlagPersistence;
-	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBMessageFlagFinder.impl")
-	protected MBMessageFlagFinder mbMessageFlagFinder;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.MBStatsUserLocalService.impl")
 	protected MBStatsUserLocalService mbStatsUserLocalService;
 	@BeanReference(name = "com.liferay.portlet.messageboards.service.persistence.MBStatsUserPersistence.impl")