diff --git a/portal-impl/src/com/liferay/portlet/wiki/service/persistence/WikiPageFinderImpl.java b/portal-impl/src/com/liferay/portlet/wiki/service/persistence/WikiPageFinderImpl.java
index 5e84aef3f5ccca389b4a7b71f9f462bb2c6a3a4a..34c0c4c6defbd36d8db70959bb0df3406bb69c2a 100644
--- a/portal-impl/src/com/liferay/portlet/wiki/service/persistence/WikiPageFinderImpl.java
+++ b/portal-impl/src/com/liferay/portlet/wiki/service/persistence/WikiPageFinderImpl.java
@@ -14,6 +14,7 @@
 
 package com.liferay.portlet.wiki.service.persistence;
 
+import com.liferay.portal.kernel.dao.orm.QueryDefinition;
 import com.liferay.portal.kernel.dao.orm.QueryPos;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.dao.orm.SQLQuery;
@@ -46,12 +47,18 @@ public class WikiPageFinderImpl
 	public static final String COUNT_BY_CREATE_DATE =
 		WikiPageFinder.class.getName() + ".countByCreateDate";
 
+	public static final String COUNT_BY_G_N_H_S =
+		WikiPageFinder.class.getName() + ".countByG_N_H_S";
+
 	public static final String FIND_BY_RESOURCE_PRIM_KEY =
 		WikiPageFinder.class.getName() + ".findByResourcePrimKey";
 
 	public static final String FIND_BY_CREATE_DATE =
 		WikiPageFinder.class.getName() + ".findByCreateDate";
 
+	public static final String FIND_BY_G_N_H_S =
+		WikiPageFinder.class.getName() + ".findByG_N_H_S";
+
 	public static final String FIND_BY_NO_ASSETS =
 		WikiPageFinder.class.getName() + ".findByNoAssets";
 
@@ -73,6 +80,15 @@ public class WikiPageFinderImpl
 	}
 
 	@Override
+	public int countByG_N_H_S(
+			long groupId, long nodeId, boolean head,
+			QueryDefinition queryDefinition)
+		throws SystemException {
+
+		return doCountByG_N_H_S(groupId, nodeId, head, queryDefinition, false);
+	}
+
+	@Override
 	public int filterCountByCreateDate(
 			long groupId, long nodeId, Date createDate, boolean before)
 		throws SystemException {
@@ -90,6 +106,15 @@ public class WikiPageFinderImpl
 	}
 
 	@Override
+	public int filterCountByG_N_H_S(
+			long groupId, long nodeId, boolean head,
+			QueryDefinition queryDefinition)
+		throws SystemException {
+
+		return doCountByG_N_H_S(groupId, nodeId, head, queryDefinition, true);
+	}
+
+	@Override
 	public List<WikiPage> filterFindByCreateDate(
 			long groupId, long nodeId, Date createDate, boolean before,
 			int start, int end)
@@ -111,6 +136,15 @@ public class WikiPageFinderImpl
 	}
 
 	@Override
+	public List<WikiPage> filterFindByG_N_H_S(
+			long groupId, long nodeId, boolean head,
+			QueryDefinition queryDefinition)
+		throws SystemException {
+
+		return doFindByG_N_H_S(groupId, nodeId, head, queryDefinition, true);
+	}
+
+	@Override
 	public WikiPage findByResourcePrimKey(long resourcePrimKey)
 		throws NoSuchPageException, SystemException {
 
@@ -195,6 +229,15 @@ public class WikiPageFinderImpl
 		}
 	}
 
+	@Override
+	public List<WikiPage> findByG_N_H_S(
+			long groupId, long nodeId, boolean head,
+			QueryDefinition queryDefinition)
+		throws SystemException {
+
+		return doFindByG_N_H_S(groupId, nodeId, head, queryDefinition, false);
+	}
+
 	protected int doCountByCreateDate(
 			long groupId, long nodeId, Timestamp createDate, boolean before,
 			boolean inlineSQLHelper)
@@ -254,6 +297,65 @@ public class WikiPageFinderImpl
 		}
 	}
 
+	protected int doCountByG_N_H_S(
+			long groupId, long nodeId, boolean head,
+			QueryDefinition queryDefinition, boolean inlineSQLHelper)
+		throws SystemException {
+
+		Session session = null;
+
+		try {
+			session = openSession();
+
+			String sql = CustomSQLUtil.get(
+				COUNT_BY_G_N_H_S, queryDefinition, "WikiPage");
+
+			if (inlineSQLHelper) {
+				sql = InlineSQLHelperUtil.replacePermissionCheck(
+					sql, WikiPage.class.getName(), "WikiPage.resourcePrimKey",
+					groupId);
+			}
+
+			SQLQuery q = session.createSQLQuery(sql);
+
+			q.addScalar(COUNT_COLUMN_NAME, Type.LONG);
+
+			QueryPos qPos = QueryPos.getInstance(q);
+
+			qPos.add(groupId);
+			qPos.add(nodeId);
+			qPos.add(head);
+
+			if (queryDefinition.getOwnerUserId() > 0) {
+				qPos.add(queryDefinition.getOwnerUserId());
+
+				if (queryDefinition.isIncludeOwner()) {
+					qPos.add(WorkflowConstants.STATUS_IN_TRASH);
+				}
+			}
+
+			qPos.add(queryDefinition.getStatus());
+
+			Iterator<Long> itr = q.iterate();
+
+			if (itr.hasNext()) {
+				Long count = itr.next();
+
+				if (count != null) {
+					return count.intValue();
+				}
+			}
+
+			return 0;
+		}
+		catch (Exception e) {
+			throw new SystemException(e);
+		}
+		finally {
+			closeSession(session);
+		}
+	}
+
 	protected List<WikiPage> doFindByCreateDate(
 			long groupId, long nodeId, Timestamp createDate, boolean before,
 			int start, int end, boolean inlineSQLHelper)
@@ -303,4 +405,58 @@ public class WikiPageFinderImpl
 		}
 	}
 
+	protected List<WikiPage> doFindByG_N_H_S(
+			long groupId, long nodeId, boolean head,
+			QueryDefinition queryDefinition, boolean inlineSQLHelper)
+		throws SystemException {
+
+		Session session = null;
+
+		try {
+			session = openSession();
+
+			String sql = CustomSQLUtil.get(
+				FIND_BY_G_N_H_S, queryDefinition, "WikiPage");
+
+			if (inlineSQLHelper) {
+				sql = InlineSQLHelperUtil.replacePermissionCheck(
+					sql, WikiPage.class.getName(), "WikiPage.resourcePrimKey",
+					groupId);
+			}
+
+			CustomSQLUtil.replaceOrderBy(
+				sql, queryDefinition.getOrderByComparator("WikiPage"));
+
+			SQLQuery q = session.createSQLQuery(sql);
+
+			q.addEntity("WikiPage", WikiPageImpl.class);
+
+			QueryPos qPos = QueryPos.getInstance(q);
+
+			qPos.add(groupId);
+			qPos.add(nodeId);
+			qPos.add(head);
+
+			if (queryDefinition.getOwnerUserId() > 0) {
+				qPos.add(queryDefinition.getOwnerUserId());
+
+				if (queryDefinition.isIncludeOwner()) {
+					qPos.add(WorkflowConstants.STATUS_IN_TRASH);
+				}
+			}
+
+			qPos.add(queryDefinition.getStatus());
+
+			return (List<WikiPage>)QueryUtil.list(
+				q, getDialect(), queryDefinition.getStart(),
+				queryDefinition.getEnd());
+		}
+		catch (Exception e) {
+			throw new SystemException(e);
+		}
+		finally {
+			closeSession(session);
+		}
+	}
+
 }
\ No newline at end of file
