Property changes on: C:\home\jkoz\java\liferay-svn\portal ___________________________________________________________________ Name: svn:ignore - .settings ActiveMQ api bin app.server.*.properties build.*.properties release.*.properties sample-*.war WEB-INF + .settings ActiveMQ api bin app.server.*.properties build.*.properties release.*.properties sample_*.war WEB-INF .metadata dir_conflicts.prej sample-dao-portlet-4.1.0.war sample-jsf-myfaces-portlet-4.1.0.war sample-jsf-sun-portlet-4.1.0.war sample-json-portlet-4.1.0.war sample-jsp-portlet-4.1.0.war sample-portal-client-portlet-4.1.0.war sample-spring-portlet-4.1.0.war sample-struts-portlet-4.1.0.war sample-tapestry-portlet-4.1.0.war Index: C:/home/jkoz/java/liferay-svn/portal/.classpath =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/.classpath (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/.classpath (working copy) @@ -20,7 +20,6 @@ - @@ -149,5 +148,6 @@ + Property changes on: C:\home\jkoz\java\liferay-svn\portal\lib ___________________________________________________________________ Name: svn:ignore + jcaptcha.jar Index: C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal/edit_article.jsp =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal/edit_article.jsp (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal/edit_article.jsp (working copy) @@ -107,7 +107,7 @@ if (Validator.isNotNull(structureId)) { try { - structure = JournalStructureLocalServiceUtil.getStructure(company.getCompanyId(), structureId); + structure = JournalStructureLocalServiceUtil.getStructure(company.getCompanyId(), themeDisplay.getPortletGroupId(), structureId); structureName = structure.getName(); } @@ -118,7 +118,7 @@ List templates = new ArrayList(); if (structure != null) { - templates = JournalTemplateLocalServiceUtil.getStructureTemplates(company.getCompanyId(), structureId); + templates = JournalTemplateLocalServiceUtil.getStructureTemplates(company.getCompanyId(), themeDisplay.getPortletGroupId(), structureId); } String templateId = BeanParamUtil.getString(article, request, "templateId"); @@ -150,7 +150,7 @@ boolean disableIncrementVersion = false; if (GetterUtil.getBoolean(PropsUtil.get(PropsUtil.JOURNAL_ARTICLE_FORCE_INCREMENT_VERSION))) { - boolean latestVersion = (article == null) || (article != null && JournalArticleLocalServiceUtil.isLatestVersion(company.getCompanyId(), articleId, version)); + boolean latestVersion = (article == null) || (article != null && JournalArticleLocalServiceUtil.isLatestVersion(company.getCompanyId(), themeDisplay.getPortletGroupId(), articleId, version)); if (!latestVersion) { incrementVersion = true; Index: C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal/edit_template.jsp =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal/edit_template.jsp (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal/edit_template.jsp (working copy) @@ -38,7 +38,7 @@ if (Validator.isNotNull(structureId)) { try { - JournalStructure structure = JournalStructureLocalServiceUtil.getStructure(company.getCompanyId(), structureId); + JournalStructure structure = JournalStructureLocalServiceUtil.getStructure(company.getCompanyId(), themeDisplay.getPortletGroupId(), structureId); structureName = structure.getName(); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_content/view.jsp =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_content/view.jsp (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_content/view.jsp (working copy) @@ -151,7 +151,7 @@ for (int i = 0; i < articleIds.length; i++) { try { - article = JournalArticleLocalServiceUtil.getLatestArticle(company.getCompanyId(), articleIds[i]); + article = JournalArticleLocalServiceUtil.getLatestArticle(company.getCompanyId(), layout.getGroupId(), articleIds[i]); %> Index: C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_content/edit_configuration.jsp =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_content/edit_configuration.jsp (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_content/edit_configuration.jsp (working copy) @@ -41,7 +41,7 @@ try { if (articleIds.length > 0) { - JournalArticle article = JournalArticleLocalServiceUtil.getLatestArticle(company.getCompanyId(), articleIds[0]); + JournalArticle article = JournalArticleLocalServiceUtil.getLatestArticle(company.getCompanyId(), layout.getGroupId(), articleIds[0]); groupId = article.getGroupId(); type = article.getType(); @@ -219,7 +219,7 @@ <% for (int i = 0; i < articleIds.length; i++) { try { - JournalArticle article = JournalArticleLocalServiceUtil.getLatestArticle(company.getCompanyId(), articleIds[i]); + JournalArticle article = JournalArticleLocalServiceUtil.getLatestArticle(company.getCompanyId(), layout.getGroupId(), articleIds[i]); %> addArticle("<%= article.getArticleId() %>"); Index: C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_articles/view.jsp =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_articles/view.jsp (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-web/docroot/html/portlet/journal_articles/view.jsp (working copy) @@ -155,7 +155,7 @@ <% String languageId = LanguageUtil.getLanguageId(request); - String content = JournalArticleLocalServiceUtil.getArticleContent(company.getCompanyId(), articleId, version, languageId, themeDisplay); + String content = JournalArticleLocalServiceUtil.getArticleContent(company.getCompanyId(), groupId, articleId, version, languageId, themeDisplay); RuntimeLogic portletLogic = new PortletLogic(application, request, response, renderRequest, renderResponse); RuntimeLogic actionURLLogic = new ActionURLLogic(renderResponse); Index: C:/home/jkoz/java/liferay-svn/portal/sql/indexes.sql =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/sql/indexes.sql (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/sql/indexes.sql (working copy) @@ -56,8 +56,16 @@ create index JournalArticle_ix_C_A on JournalArticle (companyId, articleId); create index JournalArticle_ix_C_A_A on JournalArticle (companyId, articleId, approved); +create index JournalArticle_ix_C_A_G on JournalArticle (companyId, articleId, groupId); +create index JournalArticle_ix_C_A_G_A on JournalArticle (companyId, articleId, groupId, approved); +create index JournalArticle_ix_C_G_A on JournalArticle (companyId, groupId, articleId); +create index JournalArticle_ix_C_G_A_A on JournalArticle (companyId, groupId, articleId, approved); +create index JournalArticle_ix_C_G_S on JournalArticle (companyId, groupId, structureId); +create index JournalArticle_ix_C_G_T on JournalArticle (companyId, groupId, templateId); create index JournalArticle_ix_C_S on JournalArticle (companyId, structureId); +create index JournalArticle_ix_C_S_G on JournalArticle (companyId, structureId, groupId); create index JournalArticle_ix_C_T on JournalArticle (companyId, templateId); +create index JournalArticle_ix_C_T_G on JournalArticle (companyId, templateId, groupId); create index JournalArticle_ix_CompanyId on JournalArticle (companyId); create index JournalArticle_ix_GroupId on JournalArticle (groupId); @@ -68,7 +76,9 @@ create index JournalStructure_ix_GroupId on JournalStructure (groupId); +create index JournalTemplate_ix_C_G_S on JournalTemplate (companyId, groupId, structureId); create index JournalTemplate_ix_C_S on JournalTemplate (companyId, structureId); +create index JournalTemplate_ix_C_S_G on JournalTemplate (companyId, structureId, groupId); create index JournalTemplate_ix_GroupId on JournalTemplate (groupId); create index LayoutSet_ix_C_V on LayoutSet (companyId, virtualHost); Index: C:/home/jkoz/java/liferay-svn/portal/sql/portal-tables.sql =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/sql/portal-tables.sql (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/sql/portal-tables.sql (working copy) @@ -341,9 +341,9 @@ create table JournalArticle ( companyId VARCHAR(75) not null, + groupId VARCHAR(75) not null, articleId VARCHAR(75) not null, version DOUBLE not null, - groupId VARCHAR(75) not null, userId VARCHAR(75) not null, userName VARCHAR(75) null, createDate DATE null, @@ -362,7 +362,7 @@ expired BOOLEAN, expirationDate DATE null, reviewDate DATE null, - primary key (companyId, articleId, version) + primary key (companyId, groupId, articleId, version) ); create table JournalContentSearch ( @@ -376,8 +376,8 @@ create table JournalStructure ( companyId VARCHAR(75) not null, + groupId VARCHAR(75) not null, structureId VARCHAR(75) not null, - groupId VARCHAR(75) not null, userId VARCHAR(75) not null, userName VARCHAR(75) null, createDate DATE null, @@ -385,13 +385,13 @@ name VARCHAR(75) null, description STRING null, xsd TEXT null, - primary key (companyId, structureId) + primary key (companyId, groupId, structureId) ); create table JournalTemplate ( companyId VARCHAR(75) not null, + groupId VARCHAR(75) not null, templateId VARCHAR(75) not null, - groupId VARCHAR(75) not null, userId VARCHAR(75) not null, userName VARCHAR(75) null, createDate DATE null, @@ -403,7 +403,7 @@ langType VARCHAR(75) null, smallImage BOOLEAN, smallImageURL VARCHAR(75) null, - primary key (companyId, templateId) + primary key (companyId, groupId, templateId) ); create table Layout ( Index: C:/home/jkoz/java/liferay-svn/portal/sql/update-4.1.0-4.2.0.sql =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/sql/update-4.1.0-4.2.0.sql (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/sql/update-4.1.0-4.2.0.sql (working copy) @@ -251,6 +251,15 @@ alter table JournalArticle add description STRING null; +alter table JournalArticle drop primary key; +alter table JournalArticle add primary key (companyId, groupId, articleId, version); + +alter table JournalStructure drop primary key; +alter table JournalStructure add primary key (companyId, groupId, structureId); + +alter table JournalTemplate drop primary key; +alter table JournalTemplate add primary key (companyId, groupId, templateId); + drop table JournalContentSearch; create table JournalContentSearch ( portletId VARCHAR(75) not null, Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/velocity/JournalTemplateVelocityResourceListener.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/velocity/JournalTemplateVelocityResourceListener.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/velocity/JournalTemplateVelocityResourceListener.java (working copy) @@ -58,19 +58,21 @@ if (pos != -1) { int x = source.indexOf(StringPool.SLASH, pos); int y = source.indexOf(StringPool.SLASH, x + 1); + int z = source.indexOf(StringPool.SLASH, y + 1); String companyId = source.substring(x + 1, y); - String templateId = source.substring(y + 1); + String groupId = source.substring(y + 1, z); + String templateId = source.substring(z + 1); if (_log.isDebugEnabled()) { _log.debug( "Loading " + - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); } JournalTemplate template = JournalTemplateLocalServiceUtil.getTemplate( - companyId, templateId); + companyId, groupId, templateId); String buffer = template.getXsl(); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/events/StartupAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/events/StartupAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/events/StartupAction.java (working copy) @@ -106,7 +106,7 @@ _log.debug("Finished upgrade " + upgradeProcesses[i]); } else { - _log.debug("Skipping upgrade " + upgradeProcesses[i]); + _log.debug("Skipping upgrade " + upgradeProcesses[i] + "(threshold was " + upgradeProcess.getThreshold() + ")"); } } catch (ClassNotFoundException cnfe) { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/events/FixOracleAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/events/FixOracleAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/events/FixOracleAction.java (working copy) @@ -97,7 +97,7 @@ article = (JournalArticle)articles.get(j); JournalArticleLocalServiceUtil.checkNewLine( - article.getCompanyId(), article.getArticleId(), + article.getCompanyId(), article.getGroupId(), article.getArticleId(), article.getVersion()); } @@ -138,7 +138,7 @@ structure = (JournalStructure)structures.get(i); JournalStructureLocalServiceUtil.checkNewLine( - structure.getCompanyId(), structure.getStructureId()); + structure.getCompanyId(), structure.getGroupId(), structure.getStructureId()); } } } @@ -159,7 +159,7 @@ template = (JournalTemplate)templates.get(i); JournalTemplateLocalServiceUtil.checkNewLine( - template.getCompanyId(), template.getTemplateId()); + template.getCompanyId(), template.getGroupId(), template.getTemplateId()); } } } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/cms/servlet/CMSServletUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/cms/servlet/CMSServletUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/cms/servlet/CMSServletUtil.java (working copy) @@ -54,7 +54,7 @@ } public static String getContent( - String companyId, String articleId, String languageId, + String companyId, String groupId, String articleId, String languageId, ThemeDisplay themeDisplay) { String content = null; @@ -73,7 +73,7 @@ catch (NeedsRefreshException nre) { try { content = JournalArticleLocalServiceUtil.getArticleContent( - companyId, articleId, languageId, themeDisplay); + companyId, groupId, articleId, languageId, themeDisplay); } catch (Exception e) { _log.warn(e.getMessage()); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/cms/servlet/CMSServlet.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/cms/servlet/CMSServlet.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/cms/servlet/CMSServlet.java (working copy) @@ -22,6 +22,7 @@ package com.liferay.portal.cms.servlet; +import com.liferay.portal.kernel.security.permission.PermissionChecker; import com.liferay.portal.kernel.util.StackTraceUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.language.LanguageUtil; @@ -116,7 +117,10 @@ ThemeDisplay themeDisplay = null; - String content = getContent(path, languageId, themeDisplay); + // TODO JKOZ: Is this the correct way to get the current group for CMSServlet? + String groupId = (String)req.getAttribute(PermissionChecker.GROUP_ID); + + String content = getContent(groupId, path, languageId, themeDisplay); if (Validator.isNotNull(content)) { if (_log.isDebugEnabled()) { @@ -151,10 +155,10 @@ } protected String getContent( - String articleId, String languageId, ThemeDisplay themeDisplay) { + String groupId, String articleId, String languageId, ThemeDisplay themeDisplay) { return CMSServletUtil.getContent( - _companyId, articleId, languageId, themeDisplay); + _companyId, groupId, articleId, languageId, themeDisplay); } private static Log _log = LogFactory.getLog(CMSServlet.class); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/upgrade/v4_2_0/UpgradeJournal.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/upgrade/v4_2_0/UpgradeJournal.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portal/upgrade/v4_2_0/UpgradeJournal.java (working copy) @@ -22,9 +22,23 @@ package com.liferay.portal.upgrade.v4_2_0; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Iterator; + +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.model.Resource; +import com.liferay.portal.model.impl.GroupImpl; +import com.liferay.portal.service.persistence.ResourceUtil; import com.liferay.portal.upgrade.UpgradeException; import com.liferay.portal.upgrade.UpgradeProcess; +import com.liferay.portal.util.Constants; import com.liferay.portal.util.PropsUtil; +import com.liferay.portlet.journal.service.persistence.JournalArticlePK; +import com.liferay.portlet.journal.service.persistence.JournalStructurePK; +import com.liferay.portlet.journal.service.persistence.JournalTemplatePK; +import com.liferay.util.dao.DataAccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,15 +47,19 @@ * View Source * * @author Alexander Chow + * @author Joel Kozikowski * */ public class UpgradeJournal extends UpgradeProcess { public void upgrade() throws UpgradeException { - _log.info("Upgrading"); + _log.info("Upgrading journal data"); try { _upgradeJournalContentSearch(); + _upgradeJournalArticleResourceIds(); + _upgradeJournalStructureResourceIds(); + _upgradeJournalTemplateResourceIds(); } catch (Exception e) { throw new UpgradeException(e); @@ -52,6 +70,191 @@ PropsUtil.set(PropsUtil.JOURNAL_SYNC_CONTENT_SEARCH_ON_STARTUP, "true"); } + private void _upgradeJournalArticleResourceIds() { + final String name = com.liferay.portlet.journal.model.JournalArticle.class.getName(); + + Connection con = null; + PreparedStatement ps = null; + ResultSet rs = null; + + try { + con = DataAccess.getConnection(Constants.DATA_SOURCE); + + ps = con.prepareStatement(FIND_RESOURCES); + ps.setString(1, name); + rs = ps.executeQuery(); + while (rs.next()) { + String primKey = rs.getString("primKey"); + if (primKey.indexOf("groupId") == -1) { + String articleId = extractValue(primKey, "articleId"); + String companyId = extractValue(primKey, "companyId"); + String groupId = findGroupId(FIND_JOURNAL_ARTICLE_GROUP, companyId, articleId); + if (groupId != null) { + double version = extractDouble(primKey, "version"); + JournalArticlePK pk = new JournalArticlePK(companyId, groupId, articleId, version); + updatePrimKey(rs.getString("resourceId"), pk.toString()); + } + else { + _log.warn("No group ID found for articleId " + articleId); + } + } + + } // while + } // try + catch (Exception ex) { + _log.error("Could not upgrade resource entries for " + name, ex); + } + finally { + DataAccess.cleanUp(con, ps, rs); + } + + } + + private void _upgradeJournalStructureResourceIds() { + final String name = com.liferay.portlet.journal.model.JournalStructure.class.getName(); + + Connection con = null; + PreparedStatement ps = null; + ResultSet rs = null; + + try { + con = DataAccess.getConnection(Constants.DATA_SOURCE); + + ps = con.prepareStatement(FIND_RESOURCES); + ps.setString(1, name); + rs = ps.executeQuery(); + while (rs.next()) { + String primKey = rs.getString("primKey"); + if (primKey.indexOf("groupId") == -1) { + String structureId = extractValue(primKey, "structureId"); + String companyId = extractValue(primKey, "companyId"); + String groupId = findGroupId(FIND_JOURNAL_STRUCTURE_GROUP, companyId, structureId); + if (groupId != null) { + JournalStructurePK pk = new JournalStructurePK(companyId, groupId, structureId); + updatePrimKey(rs.getString("resourceId"), pk.toString()); + } + else { + _log.warn("No group ID found for structureId " + structureId); + } + } + + } // while + } // try + catch (Exception ex) { + _log.error("Could not upgrade resource entries for " + name, ex); + } + finally { + DataAccess.cleanUp(con, ps, rs); + } + + } + + + private void _upgradeJournalTemplateResourceIds() { + final String name = com.liferay.portlet.journal.model.JournalTemplate.class.getName(); + + Connection con = null; + PreparedStatement ps = null; + ResultSet rs = null; + + try { + con = DataAccess.getConnection(Constants.DATA_SOURCE); + + ps = con.prepareStatement(FIND_RESOURCES); + ps.setString(1, name); + rs = ps.executeQuery(); + while (rs.next()) { + String primKey = rs.getString("primKey"); + if (primKey.indexOf("groupId") == -1) { + String templateId = extractValue(primKey, "templateId"); + String companyId = extractValue(primKey, "companyId"); + String groupId = findGroupId(FIND_JOURNAL_TEMPLATE_GROUP, companyId, templateId); + if (groupId != null) { + JournalTemplatePK pk = new JournalTemplatePK(companyId, groupId, templateId); + updatePrimKey(rs.getString("resourceId"), pk.toString()); + } + else { + _log.warn("No group ID found for templateId " + templateId); + } + } + } // while + } // try + catch (Exception ex) { + _log.error("Could not upgrade resource entries for " + name, ex); + } + finally { + DataAccess.cleanUp(con, ps, rs); + } + + } + + + private void updatePrimKey(String resourceId, String primKey) throws Exception { + Connection con = null; + PreparedStatement ps = null; + ResultSet rs = null; + try { + con = DataAccess.getConnection(Constants.DATA_SOURCE); + _log.debug("Updating resource " + resourceId + " with key " + primKey); + ps = con.prepareStatement(UPDATE_RESOURCE); + ps.setString(1, primKey); + ps.setString(2, resourceId); + ps.executeUpdate(); + } + finally { + DataAccess.cleanUp(con, ps, rs); + } + + } + + private double extractDouble(String primKey, String name) { + String val = extractValue(primKey, name); + return Double.parseDouble(val); + } + + + private String extractValue(String primKey, String name) { + int start = primKey.indexOf(name); + int end = primKey.indexOf(StringPool.COMMA, start); + if (end < 0) { + end = primKey.indexOf(StringPool.CLOSE_CURLY_BRACE, start); + } + return primKey.substring(start + name.length()+1, end); + } + + private String findGroupId(String queryString, String companyId, String id) { + Connection con = null; + PreparedStatement ps = null; + ResultSet rs = null; + + String groupId = null; + + try { + con = DataAccess.getConnection(Constants.DATA_SOURCE); + ps = con.prepareStatement(queryString); + ps.setString(1, companyId); + ps.setString(2, id); + rs = ps.executeQuery(); + if (rs.next()) { + groupId = rs.getString("groupId"); + } + } + catch (Exception ex) { + _log.error("Could not retrieve group id for " + id, ex); + } + finally { + DataAccess.cleanUp(con, ps, rs); + } + return groupId; + } + + private static final String FIND_RESOURCES = "SELECT resourceId, primKey FROM Resource_ WHERE name=? AND scope='individual'"; + private static final String UPDATE_RESOURCE = "UPDATE Resource_ SET primKey = ? WHERE resourceId = ?"; + + private static final String FIND_JOURNAL_ARTICLE_GROUP = "SELECT groupId FROM JournalArticle WHERE companyId=? AND articleId=?"; + private static final String FIND_JOURNAL_STRUCTURE_GROUP = "SELECT groupId FROM JournalStructure WHERE companyId=? AND structureId=?"; + private static final String FIND_JOURNAL_TEMPLATE_GROUP = "SELECT groupId FROM JournalTemplate WHERE companyId=? AND templateId=?"; + private static Log _log = LogFactory.getLog(UpgradeJournal.class); } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service.xml =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service.xml (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service.xml (working copy) @@ -8,13 +8,10 @@ + - - - - @@ -54,20 +51,24 @@

- +

@@ -113,12 +114,9 @@ + - - - - @@ -153,12 +151,9 @@ + - - - - @@ -187,8 +182,9 @@

- +

Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalArticleImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalArticleImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalArticleImpl.java (working copy) @@ -63,7 +63,7 @@ public JournalArticlePK getResourcePK() { return new JournalArticlePK( - getCompanyId(), getArticleId(), DEFAULT_VERSION); + getCompanyId(), getGroupId(), getArticleId(), DEFAULT_VERSION); } public String getContentByLocale(String languageId){ Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalArticleModelImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalArticleModelImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalArticleModelImpl.java (working copy) @@ -45,12 +45,12 @@ public static boolean XSS_ALLOW_COMPANYID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalArticle.companyId"), XSS_ALLOW_BY_MODEL); + public static boolean XSS_ALLOW_GROUPID = GetterUtil.getBoolean(PropsUtil.get( + "xss.allow.com.liferay.portlet.journal.model.JournalArticle.groupId"), + XSS_ALLOW_BY_MODEL); public static boolean XSS_ALLOW_ARTICLEID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalArticle.articleId"), XSS_ALLOW_BY_MODEL); - public static boolean XSS_ALLOW_GROUPID = GetterUtil.getBoolean(PropsUtil.get( - "xss.allow.com.liferay.portlet.journal.model.JournalArticle.groupId"), - XSS_ALLOW_BY_MODEL); public static boolean XSS_ALLOW_USERID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalArticle.userId"), XSS_ALLOW_BY_MODEL); @@ -88,11 +88,12 @@ } public JournalArticlePK getPrimaryKey() { - return new JournalArticlePK(_companyId, _articleId, _version); + return new JournalArticlePK(_companyId, _groupId, _articleId, _version); } public void setPrimaryKey(JournalArticlePK pk) { setCompanyId(pk.companyId); + setGroupId(pk.groupId); setArticleId(pk.articleId); setVersion(pk.version); } @@ -114,6 +115,23 @@ } } + public String getGroupId() { + return GetterUtil.getString(_groupId); + } + + public void setGroupId(String groupId) { + if (((groupId == null) && (_groupId != null)) || + ((groupId != null) && (_groupId == null)) || + ((groupId != null) && (_groupId != null) && + !groupId.equals(_groupId))) { + if (!XSS_ALLOW_GROUPID) { + groupId = XSSUtil.strip(groupId); + } + + _groupId = groupId; + } + } + public String getArticleId() { return GetterUtil.getString(_articleId); } @@ -141,23 +159,6 @@ } } - public String getGroupId() { - return GetterUtil.getString(_groupId); - } - - public void setGroupId(String groupId) { - if (((groupId == null) && (_groupId != null)) || - ((groupId != null) && (_groupId == null)) || - ((groupId != null) && (_groupId != null) && - !groupId.equals(_groupId))) { - if (!XSS_ALLOW_GROUPID) { - groupId = XSSUtil.strip(groupId); - } - - _groupId = groupId; - } - } - public String getUserId() { return GetterUtil.getString(_userId); } @@ -435,9 +436,9 @@ public Object clone() { JournalArticleImpl clone = new JournalArticleImpl(); clone.setCompanyId(getCompanyId()); + clone.setGroupId(getGroupId()); clone.setArticleId(getArticleId()); clone.setVersion(getVersion()); - clone.setGroupId(getGroupId()); clone.setUserId(getUserId()); clone.setUserName(getUserName()); clone.setCreateDate(getCreateDate()); @@ -521,9 +522,9 @@ } private String _companyId; + private String _groupId; private String _articleId; private double _version; - private String _groupId; private String _userId; private String _userName; private Date _createDate; Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalTemplateModelImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalTemplateModelImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalTemplateModelImpl.java (working copy) @@ -45,12 +45,12 @@ public static boolean XSS_ALLOW_COMPANYID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalTemplate.companyId"), XSS_ALLOW_BY_MODEL); + public static boolean XSS_ALLOW_GROUPID = GetterUtil.getBoolean(PropsUtil.get( + "xss.allow.com.liferay.portlet.journal.model.JournalTemplate.groupId"), + XSS_ALLOW_BY_MODEL); public static boolean XSS_ALLOW_TEMPLATEID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalTemplate.templateId"), XSS_ALLOW_BY_MODEL); - public static boolean XSS_ALLOW_GROUPID = GetterUtil.getBoolean(PropsUtil.get( - "xss.allow.com.liferay.portlet.journal.model.JournalTemplate.groupId"), - XSS_ALLOW_BY_MODEL); public static boolean XSS_ALLOW_USERID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalTemplate.userId"), XSS_ALLOW_BY_MODEL); @@ -82,11 +82,12 @@ } public JournalTemplatePK getPrimaryKey() { - return new JournalTemplatePK(_companyId, _templateId); + return new JournalTemplatePK(_companyId, _groupId, _templateId); } public void setPrimaryKey(JournalTemplatePK pk) { setCompanyId(pk.companyId); + setGroupId(pk.groupId); setTemplateId(pk.templateId); } @@ -107,6 +108,23 @@ } } + public String getGroupId() { + return GetterUtil.getString(_groupId); + } + + public void setGroupId(String groupId) { + if (((groupId == null) && (_groupId != null)) || + ((groupId != null) && (_groupId == null)) || + ((groupId != null) && (_groupId != null) && + !groupId.equals(_groupId))) { + if (!XSS_ALLOW_GROUPID) { + groupId = XSSUtil.strip(groupId); + } + + _groupId = groupId; + } + } + public String getTemplateId() { return GetterUtil.getString(_templateId); } @@ -124,23 +142,6 @@ } } - public String getGroupId() { - return GetterUtil.getString(_groupId); - } - - public void setGroupId(String groupId) { - if (((groupId == null) && (_groupId != null)) || - ((groupId != null) && (_groupId == null)) || - ((groupId != null) && (_groupId != null) && - !groupId.equals(_groupId))) { - if (!XSS_ALLOW_GROUPID) { - groupId = XSSUtil.strip(groupId); - } - - _groupId = groupId; - } - } - public String getUserId() { return GetterUtil.getString(_userId); } @@ -318,8 +319,8 @@ public Object clone() { JournalTemplateImpl clone = new JournalTemplateImpl(); clone.setCompanyId(getCompanyId()); + clone.setGroupId(getGroupId()); clone.setTemplateId(getTemplateId()); - clone.setGroupId(getGroupId()); clone.setUserId(getUserId()); clone.setUserName(getUserName()); clone.setCreateDate(getCreateDate()); @@ -380,8 +381,8 @@ } private String _companyId; + private String _groupId; private String _templateId; - private String _groupId; private String _userId; private String _userName; private Date _createDate; Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalStructureModelImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalStructureModelImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/model/impl/JournalStructureModelImpl.java (working copy) @@ -45,12 +45,12 @@ public static boolean XSS_ALLOW_COMPANYID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalStructure.companyId"), XSS_ALLOW_BY_MODEL); + public static boolean XSS_ALLOW_GROUPID = GetterUtil.getBoolean(PropsUtil.get( + "xss.allow.com.liferay.portlet.journal.model.JournalStructure.groupId"), + XSS_ALLOW_BY_MODEL); public static boolean XSS_ALLOW_STRUCTUREID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalStructure.structureId"), XSS_ALLOW_BY_MODEL); - public static boolean XSS_ALLOW_GROUPID = GetterUtil.getBoolean(PropsUtil.get( - "xss.allow.com.liferay.portlet.journal.model.JournalStructure.groupId"), - XSS_ALLOW_BY_MODEL); public static boolean XSS_ALLOW_USERID = GetterUtil.getBoolean(PropsUtil.get( "xss.allow.com.liferay.portlet.journal.model.JournalStructure.userId"), XSS_ALLOW_BY_MODEL); @@ -73,11 +73,12 @@ } public JournalStructurePK getPrimaryKey() { - return new JournalStructurePK(_companyId, _structureId); + return new JournalStructurePK(_companyId, _groupId, _structureId); } public void setPrimaryKey(JournalStructurePK pk) { setCompanyId(pk.companyId); + setGroupId(pk.groupId); setStructureId(pk.structureId); } @@ -98,6 +99,23 @@ } } + public String getGroupId() { + return GetterUtil.getString(_groupId); + } + + public void setGroupId(String groupId) { + if (((groupId == null) && (_groupId != null)) || + ((groupId != null) && (_groupId == null)) || + ((groupId != null) && (_groupId != null) && + !groupId.equals(_groupId))) { + if (!XSS_ALLOW_GROUPID) { + groupId = XSSUtil.strip(groupId); + } + + _groupId = groupId; + } + } + public String getStructureId() { return GetterUtil.getString(_structureId); } @@ -115,23 +133,6 @@ } } - public String getGroupId() { - return GetterUtil.getString(_groupId); - } - - public void setGroupId(String groupId) { - if (((groupId == null) && (_groupId != null)) || - ((groupId != null) && (_groupId == null)) || - ((groupId != null) && (_groupId != null) && - !groupId.equals(_groupId))) { - if (!XSS_ALLOW_GROUPID) { - groupId = XSSUtil.strip(groupId); - } - - _groupId = groupId; - } - } - public String getUserId() { return GetterUtil.getString(_userId); } @@ -244,8 +245,8 @@ public Object clone() { JournalStructureImpl clone = new JournalStructureImpl(); clone.setCompanyId(getCompanyId()); + clone.setGroupId(getGroupId()); clone.setStructureId(getStructureId()); - clone.setGroupId(getGroupId()); clone.setUserId(getUserId()); clone.setUserName(getUserName()); clone.setCreateDate(getCreateDate()); @@ -302,8 +303,8 @@ } private String _companyId; + private String _groupId; private String _structureId; - private String _groupId; private String _userId; private String _userName; private Date _createDate; Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalArticleServiceHttp.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalArticleServiceHttp.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalArticleServiceHttp.java (working copy) @@ -336,41 +336,48 @@ } public static com.liferay.portlet.journal.model.JournalArticle approveArticle( - HttpPrincipal httpPrincipal, java.lang.String articleId, - double version, java.lang.String plid, java.lang.String articleURL, - javax.portlet.PortletPreferences prefs) + HttpPrincipal httpPrincipal, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String plid, + java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { - Object paramObj0 = articleId; + Object paramObj0 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = new DoubleWrapper(version); - Object paramObj2 = plid; + Object paramObj1 = articleId; + if (articleId == null) { + paramObj1 = new NullWrapper("java.lang.String"); + } + + Object paramObj2 = new DoubleWrapper(version); + Object paramObj3 = plid; + if (plid == null) { - paramObj2 = new NullWrapper("java.lang.String"); + paramObj3 = new NullWrapper("java.lang.String"); } - Object paramObj3 = articleURL; + Object paramObj4 = articleURL; if (articleURL == null) { - paramObj3 = new NullWrapper("java.lang.String"); + paramObj4 = new NullWrapper("java.lang.String"); } - Object paramObj4 = prefs; + Object paramObj5 = prefs; if (prefs == null) { - paramObj4 = new NullWrapper("javax.portlet.PortletPreferences"); + paramObj5 = new NullWrapper("javax.portlet.PortletPreferences"); } MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), "approveArticle", new Object[] { - paramObj0, paramObj1, paramObj2, paramObj3, paramObj4 + paramObj0, paramObj1, paramObj2, paramObj3, paramObj4, + paramObj5 }); Object returnObj = null; @@ -400,7 +407,7 @@ public static com.liferay.portlet.journal.model.JournalArticle getArticle( HttpPrincipal httpPrincipal, java.lang.String companyId, - java.lang.String articleId, double version) + java.lang.String groupId, java.lang.String articleId, double version) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { @@ -410,16 +417,22 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = articleId; + Object paramObj1 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = new DoubleWrapper(version); + Object paramObj2 = articleId; + + if (articleId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + + Object paramObj3 = new DoubleWrapper(version); MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), "getArticle", - new Object[] { paramObj0, paramObj1, paramObj2 }); + new Object[] { paramObj0, paramObj1, paramObj2, paramObj3 }); Object returnObj = null; try { @@ -448,7 +461,8 @@ public static java.lang.String getArticleContent( HttpPrincipal httpPrincipal, java.lang.String companyId, - java.lang.String articleId, java.lang.String languageId, + java.lang.String groupId, java.lang.String articleId, + java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { @@ -459,28 +473,36 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = articleId; + Object paramObj1 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = languageId; + Object paramObj2 = articleId; - if (languageId == null) { + if (articleId == null) { paramObj2 = new NullWrapper("java.lang.String"); } - Object paramObj3 = themeDisplay; + Object paramObj3 = languageId; + if (languageId == null) { + paramObj3 = new NullWrapper("java.lang.String"); + } + + Object paramObj4 = themeDisplay; + if (themeDisplay == null) { - paramObj3 = new NullWrapper( + paramObj4 = new NullWrapper( "com.liferay.portal.theme.ThemeDisplay"); } MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), "getArticleContent", - new Object[] { paramObj0, paramObj1, paramObj2, paramObj3 }); + new Object[] { + paramObj0, paramObj1, paramObj2, paramObj3, paramObj4 + }); Object returnObj = null; try { @@ -509,7 +531,7 @@ public static java.lang.String getArticleContent( HttpPrincipal httpPrincipal, java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.SystemException, @@ -521,30 +543,37 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = articleId; + Object paramObj1 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = new DoubleWrapper(version); - Object paramObj3 = languageId; + Object paramObj2 = articleId; + if (articleId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + + Object paramObj3 = new DoubleWrapper(version); + Object paramObj4 = languageId; + if (languageId == null) { - paramObj3 = new NullWrapper("java.lang.String"); + paramObj4 = new NullWrapper("java.lang.String"); } - Object paramObj4 = themeDisplay; + Object paramObj5 = themeDisplay; if (themeDisplay == null) { - paramObj4 = new NullWrapper( + paramObj5 = new NullWrapper( "com.liferay.portal.theme.ThemeDisplay"); } MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), "getArticleContent", new Object[] { - paramObj0, paramObj1, paramObj2, paramObj3, paramObj4 + paramObj0, paramObj1, paramObj2, paramObj3, paramObj4, + paramObj5 }); Object returnObj = null; @@ -573,7 +602,8 @@ } public static void deleteArticle(HttpPrincipal httpPrincipal, - java.lang.String companyId, java.lang.String articleId, double version, + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { @@ -584,29 +614,36 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = articleId; + Object paramObj1 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = new DoubleWrapper(version); - Object paramObj3 = articleURL; + Object paramObj2 = articleId; + if (articleId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + + Object paramObj3 = new DoubleWrapper(version); + Object paramObj4 = articleURL; + if (articleURL == null) { - paramObj3 = new NullWrapper("java.lang.String"); + paramObj4 = new NullWrapper("java.lang.String"); } - Object paramObj4 = prefs; + Object paramObj5 = prefs; if (prefs == null) { - paramObj4 = new NullWrapper("javax.portlet.PortletPreferences"); + paramObj5 = new NullWrapper("javax.portlet.PortletPreferences"); } MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), "deleteArticle", new Object[] { - paramObj0, paramObj1, paramObj2, paramObj3, paramObj4 + paramObj0, paramObj1, paramObj2, paramObj3, paramObj4, + paramObj5 }); try { @@ -632,7 +669,8 @@ } public static void expireArticle(HttpPrincipal httpPrincipal, - java.lang.String companyId, java.lang.String articleId, double version, + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { @@ -643,29 +681,36 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = articleId; + Object paramObj1 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = new DoubleWrapper(version); - Object paramObj3 = articleURL; + Object paramObj2 = articleId; + if (articleId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + + Object paramObj3 = new DoubleWrapper(version); + Object paramObj4 = articleURL; + if (articleURL == null) { - paramObj3 = new NullWrapper("java.lang.String"); + paramObj4 = new NullWrapper("java.lang.String"); } - Object paramObj4 = prefs; + Object paramObj5 = prefs; if (prefs == null) { - paramObj4 = new NullWrapper("javax.portlet.PortletPreferences"); + paramObj5 = new NullWrapper("javax.portlet.PortletPreferences"); } MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), "expireArticle", new Object[] { - paramObj0, paramObj1, paramObj2, paramObj3, paramObj4 + paramObj0, paramObj1, paramObj2, paramObj3, paramObj4, + paramObj5 }); try { @@ -734,7 +779,8 @@ public static com.liferay.portlet.journal.model.JournalArticle removeArticleLocale( HttpPrincipal httpPrincipal, java.lang.String companyId, - java.lang.String articleId, double version, java.lang.String languageId) + java.lang.String groupId, java.lang.String articleId, double version, + java.lang.String languageId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { @@ -744,22 +790,30 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = articleId; + Object paramObj1 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = new DoubleWrapper(version); - Object paramObj3 = languageId; + Object paramObj2 = articleId; + if (articleId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + + Object paramObj3 = new DoubleWrapper(version); + Object paramObj4 = languageId; + if (languageId == null) { - paramObj3 = new NullWrapper("java.lang.String"); + paramObj4 = new NullWrapper("java.lang.String"); } MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), "removeArticleLocale", - new Object[] { paramObj0, paramObj1, paramObj2, paramObj3 }); + new Object[] { + paramObj0, paramObj1, paramObj2, paramObj3, paramObj4 + }); Object returnObj = null; try { @@ -788,17 +842,18 @@ public static com.liferay.portlet.journal.model.JournalArticle updateArticle( HttpPrincipal httpPrincipal, java.lang.String companyId, - java.lang.String articleId, double version, boolean incrementVersion, - java.lang.String title, java.lang.String description, - java.lang.String content, java.lang.String type, - java.lang.String structureId, java.lang.String templateId, - int displayDateMonth, int displayDateDay, int displayDateYear, - int displayDateHour, int displayDateMinute, int expirationDateMonth, - int expirationDateDay, int expirationDateYear, int expirationDateHour, - int expirationDateMinute, boolean neverExpire, int reviewDateMonth, - int reviewDateDay, int reviewDateYear, int reviewDateHour, - int reviewDateMinute, boolean neverReview, java.util.Map images, - java.lang.String articleURL, javax.portlet.PortletPreferences prefs) + java.lang.String groupId, java.lang.String articleId, double version, + boolean incrementVersion, java.lang.String title, + java.lang.String description, java.lang.String content, + java.lang.String type, java.lang.String structureId, + java.lang.String templateId, int displayDateMonth, int displayDateDay, + int displayDateYear, int displayDateHour, int displayDateMinute, + int expirationDateMonth, int expirationDateDay, int expirationDateYear, + int expirationDateHour, int expirationDateMinute, boolean neverExpire, + int reviewDateMonth, int reviewDateDay, int reviewDateYear, + int reviewDateHour, int reviewDateMinute, boolean neverReview, + java.util.Map images, java.lang.String articleURL, + javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { @@ -808,83 +863,89 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = articleId; + Object paramObj1 = groupId; - if (articleId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = new DoubleWrapper(version); - Object paramObj3 = new BooleanWrapper(incrementVersion); - Object paramObj4 = title; + Object paramObj2 = articleId; + if (articleId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + + Object paramObj3 = new DoubleWrapper(version); + Object paramObj4 = new BooleanWrapper(incrementVersion); + Object paramObj5 = title; + if (title == null) { - paramObj4 = new NullWrapper("java.lang.String"); + paramObj5 = new NullWrapper("java.lang.String"); } - Object paramObj5 = description; + Object paramObj6 = description; if (description == null) { - paramObj5 = new NullWrapper("java.lang.String"); + paramObj6 = new NullWrapper("java.lang.String"); } - Object paramObj6 = content; + Object paramObj7 = content; if (content == null) { - paramObj6 = new NullWrapper("java.lang.String"); + paramObj7 = new NullWrapper("java.lang.String"); } - Object paramObj7 = type; + Object paramObj8 = type; if (type == null) { - paramObj7 = new NullWrapper("java.lang.String"); + paramObj8 = new NullWrapper("java.lang.String"); } - Object paramObj8 = structureId; + Object paramObj9 = structureId; if (structureId == null) { - paramObj8 = new NullWrapper("java.lang.String"); + paramObj9 = new NullWrapper("java.lang.String"); } - Object paramObj9 = templateId; + Object paramObj10 = templateId; if (templateId == null) { - paramObj9 = new NullWrapper("java.lang.String"); + paramObj10 = new NullWrapper("java.lang.String"); } - Object paramObj10 = new IntegerWrapper(displayDateMonth); - Object paramObj11 = new IntegerWrapper(displayDateDay); - Object paramObj12 = new IntegerWrapper(displayDateYear); - Object paramObj13 = new IntegerWrapper(displayDateHour); - Object paramObj14 = new IntegerWrapper(displayDateMinute); - Object paramObj15 = new IntegerWrapper(expirationDateMonth); - Object paramObj16 = new IntegerWrapper(expirationDateDay); - Object paramObj17 = new IntegerWrapper(expirationDateYear); - Object paramObj18 = new IntegerWrapper(expirationDateHour); - Object paramObj19 = new IntegerWrapper(expirationDateMinute); - Object paramObj20 = new BooleanWrapper(neverExpire); - Object paramObj21 = new IntegerWrapper(reviewDateMonth); - Object paramObj22 = new IntegerWrapper(reviewDateDay); - Object paramObj23 = new IntegerWrapper(reviewDateYear); - Object paramObj24 = new IntegerWrapper(reviewDateHour); - Object paramObj25 = new IntegerWrapper(reviewDateMinute); - Object paramObj26 = new BooleanWrapper(neverReview); - Object paramObj27 = images; + Object paramObj11 = new IntegerWrapper(displayDateMonth); + Object paramObj12 = new IntegerWrapper(displayDateDay); + Object paramObj13 = new IntegerWrapper(displayDateYear); + Object paramObj14 = new IntegerWrapper(displayDateHour); + Object paramObj15 = new IntegerWrapper(displayDateMinute); + Object paramObj16 = new IntegerWrapper(expirationDateMonth); + Object paramObj17 = new IntegerWrapper(expirationDateDay); + Object paramObj18 = new IntegerWrapper(expirationDateYear); + Object paramObj19 = new IntegerWrapper(expirationDateHour); + Object paramObj20 = new IntegerWrapper(expirationDateMinute); + Object paramObj21 = new BooleanWrapper(neverExpire); + Object paramObj22 = new IntegerWrapper(reviewDateMonth); + Object paramObj23 = new IntegerWrapper(reviewDateDay); + Object paramObj24 = new IntegerWrapper(reviewDateYear); + Object paramObj25 = new IntegerWrapper(reviewDateHour); + Object paramObj26 = new IntegerWrapper(reviewDateMinute); + Object paramObj27 = new BooleanWrapper(neverReview); + Object paramObj28 = images; if (images == null) { - paramObj27 = new NullWrapper("java.util.Map"); + paramObj28 = new NullWrapper("java.util.Map"); } - Object paramObj28 = articleURL; + Object paramObj29 = articleURL; if (articleURL == null) { - paramObj28 = new NullWrapper("java.lang.String"); + paramObj29 = new NullWrapper("java.lang.String"); } - Object paramObj29 = prefs; + Object paramObj30 = prefs; if (prefs == null) { - paramObj29 = new NullWrapper("javax.portlet.PortletPreferences"); + paramObj30 = new NullWrapper("javax.portlet.PortletPreferences"); } MethodWrapper methodWrapper = new MethodWrapper(JournalArticleServiceUtil.class.getName(), @@ -896,7 +957,8 @@ paramObj14, paramObj15, paramObj16, paramObj17, paramObj18, paramObj19, paramObj20, paramObj21, paramObj22, paramObj23, paramObj24, paramObj25, - paramObj26, paramObj27, paramObj28, paramObj29 + paramObj26, paramObj27, paramObj28, paramObj29, + paramObj30 }); Object returnObj = null; Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalStructureServiceSoap.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalStructureServiceSoap.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalStructureServiceSoap.java (working copy) @@ -78,9 +78,11 @@ } public static void deleteStructure(java.lang.String companyId, - java.lang.String structureId) throws RemoteException { + java.lang.String groupId, java.lang.String structureId) + throws RemoteException { try { - JournalStructureServiceUtil.deleteStructure(companyId, structureId); + JournalStructureServiceUtil.deleteStructure(companyId, groupId, + structureId); } catch (Exception e) { String stackTrace = StackTraceUtil.getStackTrace(e); @@ -90,11 +92,11 @@ } public static com.liferay.portlet.journal.model.JournalStructureSoap getStructure( - java.lang.String companyId, java.lang.String structureId) - throws RemoteException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws RemoteException { try { com.liferay.portlet.journal.model.JournalStructure returnValue = JournalStructureServiceUtil.getStructure(companyId, - structureId); + groupId, structureId); return com.liferay.portlet.journal.model.JournalStructureSoap.toSoapModel(returnValue); } @@ -106,12 +108,12 @@ } public static com.liferay.portlet.journal.model.JournalStructureSoap updateStructure( - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsd) - throws RemoteException { + java.lang.String groupId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsd) throws RemoteException { try { - com.liferay.portlet.journal.model.JournalStructure returnValue = JournalStructureServiceUtil.updateStructure(structureId, - name, description, xsd); + com.liferay.portlet.journal.model.JournalStructure returnValue = JournalStructureServiceUtil.updateStructure(groupId, + structureId, name, description, xsd); return com.liferay.portlet.journal.model.JournalStructureSoap.toSoapModel(returnValue); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalArticleServiceSoap.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalArticleServiceSoap.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalArticleServiceSoap.java (working copy) @@ -38,11 +38,11 @@ */ public class JournalArticleServiceSoap { public static com.liferay.portlet.journal.model.JournalArticleSoap getArticle( - java.lang.String companyId, java.lang.String articleId, double version) - throws RemoteException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version) throws RemoteException { try { com.liferay.portlet.journal.model.JournalArticle returnValue = JournalArticleServiceUtil.getArticle(companyId, - articleId, version); + groupId, articleId, version); return com.liferay.portlet.journal.model.JournalArticleSoap.toSoapModel(returnValue); } @@ -66,11 +66,12 @@ } public static com.liferay.portlet.journal.model.JournalArticleSoap removeArticleLocale( - java.lang.String companyId, java.lang.String articleId, double version, - java.lang.String languageId) throws RemoteException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId) + throws RemoteException { try { com.liferay.portlet.journal.model.JournalArticle returnValue = JournalArticleServiceUtil.removeArticleLocale(companyId, - articleId, version, languageId); + groupId, articleId, version, languageId); return com.liferay.portlet.journal.model.JournalArticleSoap.toSoapModel(returnValue); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalTemplateServiceHttp.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalTemplateServiceHttp.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalTemplateServiceHttp.java (working copy) @@ -258,7 +258,8 @@ } public static void deleteTemplate(HttpPrincipal httpPrincipal, - java.lang.String companyId, java.lang.String templateId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { @@ -268,14 +269,21 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = templateId; + Object paramObj1 = groupId; - if (templateId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } + Object paramObj2 = templateId; + + if (templateId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + MethodWrapper methodWrapper = new MethodWrapper(JournalTemplateServiceUtil.class.getName(), - "deleteTemplate", new Object[] { paramObj0, paramObj1 }); + "deleteTemplate", + new Object[] { paramObj0, paramObj1, paramObj2 }); try { TunnelUtil.invoke(httpPrincipal, methodWrapper); @@ -301,7 +309,7 @@ public static com.liferay.portlet.journal.model.JournalTemplate getTemplate( HttpPrincipal httpPrincipal, java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { @@ -311,14 +319,21 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = templateId; + Object paramObj1 = groupId; - if (templateId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } + Object paramObj2 = templateId; + + if (templateId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + MethodWrapper methodWrapper = new MethodWrapper(JournalTemplateServiceUtil.class.getName(), - "getTemplate", new Object[] { paramObj0, paramObj1 }); + "getTemplate", + new Object[] { paramObj0, paramObj1, paramObj2 }); Object returnObj = null; try { @@ -346,69 +361,77 @@ } public static com.liferay.portlet.journal.model.JournalTemplate updateTemplate( - HttpPrincipal httpPrincipal, java.lang.String templateId, - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsl, boolean formatXsl, - java.lang.String langType, boolean smallImage, - java.lang.String smallImageURL, java.io.File smallFile) + HttpPrincipal httpPrincipal, java.lang.String groupId, + java.lang.String templateId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsl, boolean formatXsl, java.lang.String langType, + boolean smallImage, java.lang.String smallImageURL, + java.io.File smallFile) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { - Object paramObj0 = templateId; + Object paramObj0 = groupId; - if (templateId == null) { + if (groupId == null) { paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = structureId; + Object paramObj1 = templateId; - if (structureId == null) { + if (templateId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = name; + Object paramObj2 = structureId; - if (name == null) { + if (structureId == null) { paramObj2 = new NullWrapper("java.lang.String"); } - Object paramObj3 = description; + Object paramObj3 = name; - if (description == null) { + if (name == null) { paramObj3 = new NullWrapper("java.lang.String"); } - Object paramObj4 = xsl; + Object paramObj4 = description; - if (xsl == null) { + if (description == null) { paramObj4 = new NullWrapper("java.lang.String"); } - Object paramObj5 = new BooleanWrapper(formatXsl); - Object paramObj6 = langType; + Object paramObj5 = xsl; + if (xsl == null) { + paramObj5 = new NullWrapper("java.lang.String"); + } + + Object paramObj6 = new BooleanWrapper(formatXsl); + Object paramObj7 = langType; + if (langType == null) { - paramObj6 = new NullWrapper("java.lang.String"); + paramObj7 = new NullWrapper("java.lang.String"); } - Object paramObj7 = new BooleanWrapper(smallImage); - Object paramObj8 = smallImageURL; + Object paramObj8 = new BooleanWrapper(smallImage); + Object paramObj9 = smallImageURL; if (smallImageURL == null) { - paramObj8 = new NullWrapper("java.lang.String"); + paramObj9 = new NullWrapper("java.lang.String"); } - Object paramObj9 = smallFile; + Object paramObj10 = smallFile; if (smallFile == null) { - paramObj9 = new NullWrapper("java.io.File"); + paramObj10 = new NullWrapper("java.io.File"); } MethodWrapper methodWrapper = new MethodWrapper(JournalTemplateServiceUtil.class.getName(), "updateTemplate", new Object[] { paramObj0, paramObj1, paramObj2, paramObj3, paramObj4, - paramObj5, paramObj6, paramObj7, paramObj8, paramObj9 + paramObj5, paramObj6, paramObj7, paramObj8, paramObj9, + paramObj10 }); Object returnObj = null; Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalTemplateServiceSoap.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalTemplateServiceSoap.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalTemplateServiceSoap.java (working copy) @@ -38,9 +38,11 @@ */ public class JournalTemplateServiceSoap { public static void deleteTemplate(java.lang.String companyId, - java.lang.String templateId) throws RemoteException { + java.lang.String groupId, java.lang.String templateId) + throws RemoteException { try { - JournalTemplateServiceUtil.deleteTemplate(companyId, templateId); + JournalTemplateServiceUtil.deleteTemplate(companyId, groupId, + templateId); } catch (Exception e) { String stackTrace = StackTraceUtil.getStackTrace(e); @@ -50,11 +52,11 @@ } public static com.liferay.portlet.journal.model.JournalTemplateSoap getTemplate( - java.lang.String companyId, java.lang.String templateId) - throws RemoteException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws RemoteException { try { com.liferay.portlet.journal.model.JournalTemplate returnValue = JournalTemplateServiceUtil.getTemplate(companyId, - templateId); + groupId, templateId); return com.liferay.portlet.journal.model.JournalTemplateSoap.toSoapModel(returnValue); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalStructureServiceHttp.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalStructureServiceHttp.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/http/JournalStructureServiceHttp.java (working copy) @@ -198,7 +198,8 @@ } public static void deleteStructure(HttpPrincipal httpPrincipal, - java.lang.String companyId, java.lang.String structureId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { @@ -208,14 +209,21 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = structureId; + Object paramObj1 = groupId; - if (structureId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } + Object paramObj2 = structureId; + + if (structureId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + MethodWrapper methodWrapper = new MethodWrapper(JournalStructureServiceUtil.class.getName(), - "deleteStructure", new Object[] { paramObj0, paramObj1 }); + "deleteStructure", + new Object[] { paramObj0, paramObj1, paramObj2 }); try { TunnelUtil.invoke(httpPrincipal, methodWrapper); @@ -241,7 +249,7 @@ public static com.liferay.portlet.journal.model.JournalStructure getStructure( HttpPrincipal httpPrincipal, java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { @@ -251,14 +259,21 @@ paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = structureId; + Object paramObj1 = groupId; - if (structureId == null) { + if (groupId == null) { paramObj1 = new NullWrapper("java.lang.String"); } + Object paramObj2 = structureId; + + if (structureId == null) { + paramObj2 = new NullWrapper("java.lang.String"); + } + MethodWrapper methodWrapper = new MethodWrapper(JournalStructureServiceUtil.class.getName(), - "getStructure", new Object[] { paramObj0, paramObj1 }); + "getStructure", + new Object[] { paramObj0, paramObj1, paramObj2 }); Object returnObj = null; try { @@ -286,39 +301,47 @@ } public static com.liferay.portlet.journal.model.JournalStructure updateStructure( - HttpPrincipal httpPrincipal, java.lang.String structureId, - java.lang.String name, java.lang.String description, - java.lang.String xsd) + HttpPrincipal httpPrincipal, java.lang.String groupId, + java.lang.String structureId, java.lang.String name, + java.lang.String description, java.lang.String xsd) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException { try { - Object paramObj0 = structureId; + Object paramObj0 = groupId; - if (structureId == null) { + if (groupId == null) { paramObj0 = new NullWrapper("java.lang.String"); } - Object paramObj1 = name; + Object paramObj1 = structureId; - if (name == null) { + if (structureId == null) { paramObj1 = new NullWrapper("java.lang.String"); } - Object paramObj2 = description; + Object paramObj2 = name; - if (description == null) { + if (name == null) { paramObj2 = new NullWrapper("java.lang.String"); } - Object paramObj3 = xsd; + Object paramObj3 = description; - if (xsd == null) { + if (description == null) { paramObj3 = new NullWrapper("java.lang.String"); } + Object paramObj4 = xsd; + + if (xsd == null) { + paramObj4 = new NullWrapper("java.lang.String"); + } + MethodWrapper methodWrapper = new MethodWrapper(JournalStructureServiceUtil.class.getName(), "updateStructure", - new Object[] { paramObj0, paramObj1, paramObj2, paramObj3 }); + new Object[] { + paramObj0, paramObj1, paramObj2, paramObj3, paramObj4 + }); Object returnObj = null; try { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalArticleServiceEJBImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalArticleServiceEJBImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalArticleServiceEJBImpl.java (working copy) @@ -99,39 +99,42 @@ } public com.liferay.portlet.journal.model.JournalArticle approveArticle( - java.lang.String articleId, double version, java.lang.String plid, - java.lang.String articleURL, javax.portlet.PortletPreferences prefs) + java.lang.String groupId, java.lang.String articleId, double version, + java.lang.String plid, java.lang.String articleURL, + javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); - return JournalArticleServiceFactory.getTxImpl().approveArticle(articleId, - version, plid, articleURL, prefs); + return JournalArticleServiceFactory.getTxImpl().approveArticle(groupId, + articleId, version, plid, articleURL, prefs); } public com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId, double version) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); return JournalArticleServiceFactory.getTxImpl().getArticle(companyId, - articleId, version); + groupId, articleId, version); } public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, java.lang.String languageId, + java.lang.String groupId, java.lang.String articleId, + java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); return JournalArticleServiceFactory.getTxImpl().getArticleContent(companyId, - articleId, languageId, themeDisplay); + groupId, articleId, languageId, themeDisplay); } public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, @@ -139,27 +142,27 @@ PrincipalSessionBean.setThreadValues(_sc); return JournalArticleServiceFactory.getTxImpl().getArticleContent(companyId, - articleId, version, languageId, themeDisplay); + groupId, articleId, version, languageId, themeDisplay); } public void deleteArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); JournalArticleServiceFactory.getTxImpl().deleteArticle(companyId, - articleId, version, articleURL, prefs); + groupId, articleId, version, articleURL, prefs); } public void expireArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); JournalArticleServiceFactory.getTxImpl().expireArticle(companyId, - articleId, version, articleURL, prefs); + groupId, articleId, version, articleURL, prefs); } public void removeArticleLocale(java.lang.String companyId, @@ -172,41 +175,42 @@ } public com.liferay.portlet.journal.model.JournalArticle removeArticleLocale( - java.lang.String companyId, java.lang.String articleId, double version, - java.lang.String languageId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); return JournalArticleServiceFactory.getTxImpl().removeArticleLocale(companyId, - articleId, version, languageId); + groupId, articleId, version, languageId); } public com.liferay.portlet.journal.model.JournalArticle updateArticle( - java.lang.String companyId, java.lang.String articleId, double version, - boolean incrementVersion, java.lang.String title, - java.lang.String description, java.lang.String content, - java.lang.String type, java.lang.String structureId, - java.lang.String templateId, int displayDateMonth, int displayDateDay, - int displayDateYear, int displayDateHour, int displayDateMinute, - int expirationDateMonth, int expirationDateDay, int expirationDateYear, - int expirationDateHour, int expirationDateMinute, boolean neverExpire, - int reviewDateMonth, int reviewDateDay, int reviewDateYear, - int reviewDateHour, int reviewDateMinute, boolean neverReview, - java.util.Map images, java.lang.String articleURL, - javax.portlet.PortletPreferences prefs) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, boolean incrementVersion, + java.lang.String title, java.lang.String description, + java.lang.String content, java.lang.String type, + java.lang.String structureId, java.lang.String templateId, + int displayDateMonth, int displayDateDay, int displayDateYear, + int displayDateHour, int displayDateMinute, int expirationDateMonth, + int expirationDateDay, int expirationDateYear, int expirationDateHour, + int expirationDateMinute, boolean neverExpire, int reviewDateMonth, + int reviewDateDay, int reviewDateYear, int reviewDateHour, + int reviewDateMinute, boolean neverReview, java.util.Map images, + java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); return JournalArticleServiceFactory.getTxImpl().updateArticle(companyId, - articleId, version, incrementVersion, title, description, content, - type, structureId, templateId, displayDateMonth, displayDateDay, - displayDateYear, displayDateHour, displayDateMinute, - expirationDateMonth, expirationDateDay, expirationDateYear, - expirationDateHour, expirationDateMinute, neverExpire, - reviewDateMonth, reviewDateDay, reviewDateYear, reviewDateHour, - reviewDateMinute, neverReview, images, articleURL, prefs); + groupId, articleId, version, incrementVersion, title, description, + content, type, structureId, templateId, displayDateMonth, + displayDateDay, displayDateYear, displayDateHour, + displayDateMinute, expirationDateMonth, expirationDateDay, + expirationDateYear, expirationDateHour, expirationDateMinute, + neverExpire, reviewDateMonth, reviewDateDay, reviewDateYear, + reviewDateHour, reviewDateMinute, neverReview, images, articleURL, + prefs); } public void ejbCreate() throws CreateException { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalTemplateLocalServiceEJBImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalTemplateLocalServiceEJBImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalTemplateLocalServiceEJBImpl.java (working copy) @@ -90,13 +90,33 @@ guestPermissions); } + public com.liferay.portlet.journal.model.JournalTemplate addTemplate( + java.lang.String userId, java.lang.String groupId, + java.lang.String templateId, boolean autoTemplateId, + java.lang.String plid, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsl, boolean formatXsl, java.lang.String langType, + boolean smallImage, java.lang.String smallImageURL, + java.io.File smallFile, java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.PortalException, + com.liferay.portal.SystemException { + return JournalTemplateLocalServiceFactory.getTxImpl().addTemplate(userId, + groupId, templateId, autoTemplateId, plid, structureId, name, + description, xsl, formatXsl, langType, smallImage, smallImageURL, + smallFile, addCommunityPermissions, addGuestPermissions, + communityPermissions, guestPermissions); + } + public void addTemplateResources(java.lang.String companyId, - java.lang.String templateId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String templateId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalServiceFactory.getTxImpl().addTemplateResources(companyId, - templateId, addCommunityPermissions, addGuestPermissions); + groupId, templateId, addCommunityPermissions, addGuestPermissions); } public void addTemplateResources( @@ -109,12 +129,13 @@ } public void addTemplateResources(java.lang.String companyId, - java.lang.String templateId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String templateId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalServiceFactory.getTxImpl().addTemplateResources(companyId, - templateId, communityPermissions, guestPermissions); + groupId, templateId, communityPermissions, guestPermissions); } public void addTemplateResources( @@ -128,19 +149,19 @@ } public void checkNewLine(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalServiceFactory.getTxImpl().checkNewLine(companyId, - templateId); + groupId, templateId); } public void deleteTemplate(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalServiceFactory.getTxImpl().deleteTemplate(companyId, - templateId); + groupId, templateId); } public void deleteTemplate( @@ -151,33 +172,36 @@ } public java.util.List getStructureTemplates(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { return JournalTemplateLocalServiceFactory.getTxImpl() .getStructureTemplates(companyId, - structureId); + groupId, structureId); } public java.util.List getStructureTemplates(java.lang.String companyId, - java.lang.String structureId, int begin, int end) - throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String structureId, int begin, + int end) throws com.liferay.portal.SystemException { return JournalTemplateLocalServiceFactory.getTxImpl() .getStructureTemplates(companyId, - structureId, begin, end); + groupId, structureId, begin, end); } public int getStructureTemplatesCount(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { return JournalTemplateLocalServiceFactory.getTxImpl() .getStructureTemplatesCount(companyId, - structureId); + groupId, structureId); } public com.liferay.portlet.journal.model.JournalTemplate getTemplate( - java.lang.String companyId, java.lang.String templateId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalTemplateLocalServiceFactory.getTxImpl().getTemplate(companyId, - templateId); + groupId, templateId); } public java.util.List getTemplates(java.lang.String groupId) @@ -219,16 +243,17 @@ } public com.liferay.portlet.journal.model.JournalTemplate updateTemplate( - java.lang.String companyId, java.lang.String templateId, - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsl, boolean formatXsl, - java.lang.String langType, boolean smallImage, - java.lang.String smallImageURL, java.io.File smallFile) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsl, boolean formatXsl, java.lang.String langType, + boolean smallImage, java.lang.String smallImageURL, + java.io.File smallFile) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalTemplateLocalServiceFactory.getTxImpl().updateTemplate(companyId, - templateId, structureId, name, description, xsl, formatXsl, - langType, smallImage, smallImageURL, smallFile); + groupId, templateId, structureId, name, description, xsl, + formatXsl, langType, smallImage, smallImageURL, smallFile); } public void ejbCreate() throws CreateException { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalArticleLocalServiceEJBImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalArticleLocalServiceEJBImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalArticleLocalServiceEJBImpl.java (working copy) @@ -123,13 +123,45 @@ guestPermissions); } + public com.liferay.portlet.journal.model.JournalArticle addArticle( + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, boolean autoArticleId, + java.lang.String plid, java.lang.String title, + java.lang.String description, java.lang.String content, + java.lang.String type, java.lang.String structureId, + java.lang.String templateId, int displayDateMonth, int displayDateDay, + int displayDateYear, int displayDateHour, int displayDateMinute, + int expirationDateMonth, int expirationDateDay, int expirationDateYear, + int expirationDateHour, int expirationDateMinute, boolean neverExpire, + int reviewDateMonth, int reviewDateDay, int reviewDateYear, + int reviewDateHour, int reviewDateMinute, boolean neverReview, + java.util.Map images, java.lang.String articleURL, + javax.portlet.PortletPreferences prefs, + java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.PortalException, + com.liferay.portal.SystemException { + return JournalArticleLocalServiceFactory.getTxImpl().addArticle(userId, + groupId, articleId, autoArticleId, plid, title, description, + content, type, structureId, templateId, displayDateMonth, + displayDateDay, displayDateYear, displayDateHour, + displayDateMinute, expirationDateMonth, expirationDateDay, + expirationDateYear, expirationDateHour, expirationDateMinute, + neverExpire, reviewDateMonth, reviewDateDay, reviewDateYear, + reviewDateHour, reviewDateMinute, neverReview, images, articleURL, + prefs, addCommunityPermissions, addGuestPermissions, + communityPermissions, guestPermissions); + } + public void addArticleResources(java.lang.String companyId, - java.lang.String articleId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String articleId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalServiceFactory.getTxImpl().addArticleResources(companyId, - articleId, addCommunityPermissions, addGuestPermissions); + groupId, articleId, addCommunityPermissions, addGuestPermissions); } public void addArticleResources( @@ -142,12 +174,13 @@ } public void addArticleResources(java.lang.String companyId, - java.lang.String articleId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String articleId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalServiceFactory.getTxImpl().addArticleResources(companyId, - articleId, communityPermissions, guestPermissions); + groupId, articleId, communityPermissions, guestPermissions); } public void addArticleResources( @@ -161,12 +194,13 @@ } public com.liferay.portlet.journal.model.JournalArticle approveArticle( - java.lang.String userId, java.lang.String articleId, double version, + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().approveArticle(userId, - articleId, version, articleURL, prefs); + groupId, articleId, version, articleURL, prefs); } public void checkArticles() @@ -176,20 +210,20 @@ } public void checkNewLine(java.lang.String companyId, - java.lang.String articleId, double version) + java.lang.String groupId, java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalServiceFactory.getTxImpl().checkNewLine(companyId, - articleId, version); + groupId, articleId, version); } public void deleteArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalServiceFactory.getTxImpl().deleteArticle(companyId, - articleId, version, articleURL, prefs); + groupId, articleId, version, articleURL, prefs); } public void deleteArticle( @@ -208,12 +242,12 @@ } public void expireArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalServiceFactory.getTxImpl().expireArticle(companyId, - articleId, version, articleURL, prefs); + groupId, articleId, version, articleURL, prefs); } public void expireArticle( @@ -226,38 +260,41 @@ } public com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getArticle(companyId, - articleId); + groupId, articleId); } public com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId, double version) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getArticle(companyId, - articleId, version); + groupId, articleId, version); } public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, java.lang.String languageId, + java.lang.String groupId, java.lang.String articleId, + java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getArticleContent(companyId, - articleId, languageId, themeDisplay); + groupId, articleId, languageId, themeDisplay); } public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getArticleContent(companyId, - articleId, version, languageId, themeDisplay); + groupId, articleId, version, languageId, themeDisplay); } public java.util.List getArticles(java.lang.String groupId) @@ -284,90 +321,96 @@ } public com.liferay.portlet.journal.model.JournalArticle getDisplayArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getDisplayArticle(companyId, - articleId); + groupId, articleId); } public com.liferay.portlet.journal.model.JournalArticle getLatestArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getLatestArticle(companyId, - articleId); + groupId, articleId); } public com.liferay.portlet.journal.model.JournalArticle getLatestArticle( - java.lang.String companyId, java.lang.String articleId, - java.lang.Boolean approved) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, java.lang.Boolean approved) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getLatestArticle(companyId, - articleId, approved); + groupId, articleId, approved); } public double getLatestVersion(java.lang.String companyId, - java.lang.String articleId) + java.lang.String groupId, java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().getLatestVersion(companyId, - articleId); + groupId, articleId); } public java.util.List getStructureArticles(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl() .getStructureArticles(companyId, - structureId); + groupId, structureId); } public java.util.List getStructureArticles(java.lang.String companyId, - java.lang.String structureId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + java.lang.String groupId, java.lang.String structureId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl() .getStructureArticles(companyId, - structureId, begin, end, obc); + groupId, structureId, begin, end, obc); } public int getStructureArticlesCount(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl() .getStructureArticlesCount(companyId, - structureId); + groupId, structureId); } public java.util.List getTemplateArticles(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl() .getTemplateArticles(companyId, - templateId); + groupId, templateId); } public java.util.List getTemplateArticles(java.lang.String companyId, - java.lang.String templateId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + java.lang.String groupId, java.lang.String templateId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl() .getTemplateArticles(companyId, - templateId, begin, end, obc); + groupId, templateId, begin, end, obc); } public int getTemplateArticlesCount(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl() .getTemplateArticlesCount(companyId, - templateId); + groupId, templateId); } public boolean isLatestVersion(java.lang.String companyId, - java.lang.String articleId, double version) + java.lang.String groupId, java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().isLatestVersion(companyId, - articleId, version); + groupId, articleId, version); } public void reIndex(java.lang.String[] ids) @@ -376,13 +419,13 @@ } public com.liferay.portlet.journal.model.JournalArticle removeArticleLocale( - java.lang.String companyId, java.lang.String articleId, double version, - java.lang.String languageId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl() .removeArticleLocale(companyId, - articleId, version, languageId); + groupId, articleId, version, languageId); } public com.liferay.portal.kernel.search.Hits search( @@ -436,28 +479,29 @@ } public com.liferay.portlet.journal.model.JournalArticle updateArticle( - java.lang.String userId, java.lang.String articleId, double version, - boolean incrementVersion, java.lang.String title, - java.lang.String description, java.lang.String content, - java.lang.String type, java.lang.String structureId, - java.lang.String templateId, int displayDateMonth, int displayDateDay, - int displayDateYear, int displayDateHour, int displayDateMinute, - int expirationDateMonth, int expirationDateDay, int expirationDateYear, - int expirationDateHour, int expirationDateMinute, boolean neverExpire, - int reviewDateMonth, int reviewDateDay, int reviewDateYear, - int reviewDateHour, int reviewDateMinute, boolean neverReview, - java.util.Map images, java.lang.String articleURL, - javax.portlet.PortletPreferences prefs) + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, double version, boolean incrementVersion, + java.lang.String title, java.lang.String description, + java.lang.String content, java.lang.String type, + java.lang.String structureId, java.lang.String templateId, + int displayDateMonth, int displayDateDay, int displayDateYear, + int displayDateHour, int displayDateMinute, int expirationDateMonth, + int expirationDateDay, int expirationDateYear, int expirationDateHour, + int expirationDateMinute, boolean neverExpire, int reviewDateMonth, + int reviewDateDay, int reviewDateYear, int reviewDateHour, + int reviewDateMinute, boolean neverReview, java.util.Map images, + java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalArticleLocalServiceFactory.getTxImpl().updateArticle(userId, - articleId, version, incrementVersion, title, description, content, - type, structureId, templateId, displayDateMonth, displayDateDay, - displayDateYear, displayDateHour, displayDateMinute, - expirationDateMonth, expirationDateDay, expirationDateYear, - expirationDateHour, expirationDateMinute, neverExpire, - reviewDateMonth, reviewDateDay, reviewDateYear, reviewDateHour, - reviewDateMinute, neverReview, images, articleURL, prefs); + groupId, articleId, version, incrementVersion, title, description, + content, type, structureId, templateId, displayDateMonth, + displayDateDay, displayDateYear, displayDateHour, + displayDateMinute, expirationDateMonth, expirationDateDay, + expirationDateYear, expirationDateHour, expirationDateMinute, + neverExpire, reviewDateMonth, reviewDateDay, reviewDateYear, + reviewDateHour, reviewDateMinute, neverReview, images, articleURL, + prefs); } public void ejbCreate() throws CreateException { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalStructureServiceEJBImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalStructureServiceEJBImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalStructureServiceEJBImpl.java (working copy) @@ -69,33 +69,35 @@ } public void deleteStructure(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); JournalStructureServiceFactory.getTxImpl().deleteStructure(companyId, - structureId); + groupId, structureId); } public com.liferay.portlet.journal.model.JournalStructure getStructure( - java.lang.String companyId, java.lang.String structureId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); return JournalStructureServiceFactory.getTxImpl().getStructure(companyId, - structureId); + groupId, structureId); } public com.liferay.portlet.journal.model.JournalStructure updateStructure( - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsd) + java.lang.String groupId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsd) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); - return JournalStructureServiceFactory.getTxImpl().updateStructure(structureId, - name, description, xsd); + return JournalStructureServiceFactory.getTxImpl().updateStructure(groupId, + structureId, name, description, xsd); } public void ejbCreate() throws CreateException { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalStructureLocalServiceEJBImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalStructureLocalServiceEJBImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalStructureLocalServiceEJBImpl.java (working copy) @@ -78,13 +78,30 @@ guestPermissions); } + public com.liferay.portlet.journal.model.JournalStructure addStructure( + java.lang.String userId, java.lang.String groupId, + java.lang.String structureId, boolean autoStructureId, + java.lang.String plid, java.lang.String name, + java.lang.String description, java.lang.String xsd, + java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.PortalException, + com.liferay.portal.SystemException { + return JournalStructureLocalServiceFactory.getTxImpl().addStructure(userId, + groupId, structureId, autoStructureId, plid, name, description, + xsd, addCommunityPermissions, addGuestPermissions, + communityPermissions, guestPermissions); + } + public void addStructureResources(java.lang.String companyId, - java.lang.String structureId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String structureId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalServiceFactory.getTxImpl().addStructureResources(companyId, - structureId, addCommunityPermissions, addGuestPermissions); + groupId, structureId, addCommunityPermissions, addGuestPermissions); } public void addStructureResources( @@ -97,12 +114,13 @@ } public void addStructureResources(java.lang.String companyId, - java.lang.String structureId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String structureId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalServiceFactory.getTxImpl().addStructureResources(companyId, - structureId, communityPermissions, guestPermissions); + groupId, structureId, communityPermissions, guestPermissions); } public void addStructureResources( @@ -116,19 +134,19 @@ } public void checkNewLine(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalServiceFactory.getTxImpl().checkNewLine(companyId, - structureId); + groupId, structureId); } public void deleteStructure(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalServiceFactory.getTxImpl().deleteStructure(companyId, - structureId); + groupId, structureId); } public void deleteStructure( @@ -139,11 +157,12 @@ } public com.liferay.portlet.journal.model.JournalStructure getStructure( - java.lang.String companyId, java.lang.String structureId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalStructureLocalServiceFactory.getTxImpl().getStructure(companyId, - structureId); + groupId, structureId); } public java.util.List getStructures(java.lang.String groupId) @@ -183,13 +202,13 @@ } public com.liferay.portlet.journal.model.JournalStructure updateStructure( - java.lang.String companyId, java.lang.String structureId, - java.lang.String name, java.lang.String description, - java.lang.String xsd) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, java.lang.String name, + java.lang.String description, java.lang.String xsd) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { return JournalStructureLocalServiceFactory.getTxImpl().updateStructure(companyId, - structureId, name, description, xsd); + groupId, structureId, name, description, xsd); } public void ejbCreate() throws CreateException { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalTemplateServiceEJBImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalTemplateServiceEJBImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/ejb/JournalTemplateServiceEJBImpl.java (working copy) @@ -76,37 +76,38 @@ } public void deleteTemplate(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); JournalTemplateServiceFactory.getTxImpl().deleteTemplate(companyId, - templateId); + groupId, templateId); } public com.liferay.portlet.journal.model.JournalTemplate getTemplate( - java.lang.String companyId, java.lang.String templateId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); return JournalTemplateServiceFactory.getTxImpl().getTemplate(companyId, - templateId); + groupId, templateId); } public com.liferay.portlet.journal.model.JournalTemplate updateTemplate( - java.lang.String templateId, java.lang.String structureId, - java.lang.String name, java.lang.String description, - java.lang.String xsl, boolean formatXsl, java.lang.String langType, - boolean smallImage, java.lang.String smallImageURL, - java.io.File smallFile) + java.lang.String groupId, java.lang.String templateId, + java.lang.String structureId, java.lang.String name, + java.lang.String description, java.lang.String xsl, boolean formatXsl, + java.lang.String langType, boolean smallImage, + java.lang.String smallImageURL, java.io.File smallFile) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { PrincipalSessionBean.setThreadValues(_sc); - return JournalTemplateServiceFactory.getTxImpl().updateTemplate(templateId, - structureId, name, description, xsl, formatXsl, langType, - smallImage, smallImageURL, smallFile); + return JournalTemplateServiceFactory.getTxImpl().updateTemplate(groupId, + templateId, structureId, name, description, xsl, formatXsl, + langType, smallImage, smallImageURL, smallFile); } public void ejbCreate() throws CreateException { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalArticleServiceImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalArticleServiceImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalArticleServiceImpl.java (working copy) @@ -109,7 +109,7 @@ } public JournalArticle approveArticle( - String articleId, double version, String plid, String articleURL, + String groupId, String articleId, double version, String plid, String articleURL, PortletPreferences prefs) throws PortalException, SystemException { @@ -120,66 +120,66 @@ ActionKeys.APPROVE_ARTICLE); return JournalArticleLocalServiceUtil.approveArticle( - user.getUserId(), articleId, version, articleURL, prefs); + user.getUserId(), groupId, articleId, version, articleURL, prefs); } public JournalArticle getArticle( - String companyId, String articleId, double version) + String companyId, String groupId, String articleId, double version) throws PortalException, SystemException { JournalArticlePermission.check( - getPermissionChecker(), companyId, articleId, ActionKeys.VIEW); + getPermissionChecker(), companyId, groupId, articleId, ActionKeys.VIEW); return JournalArticleLocalServiceUtil.getArticle( - companyId, articleId, version); + companyId, groupId, articleId, version); } public String getArticleContent( - String companyId, String articleId, String languageId, + String companyId, String groupId, String articleId, String languageId, ThemeDisplay themeDisplay) throws PortalException, SystemException { JournalArticlePermission.check( - getPermissionChecker(), companyId, articleId, ActionKeys.VIEW); + getPermissionChecker(), companyId, groupId, articleId, ActionKeys.VIEW); return JournalArticleLocalServiceUtil.getArticleContent( - companyId, articleId, languageId, themeDisplay); + companyId, groupId, articleId, languageId, themeDisplay); } public String getArticleContent( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String languageId, ThemeDisplay themeDisplay) throws PortalException, SystemException { JournalArticlePermission.check( - getPermissionChecker(), companyId, articleId, ActionKeys.VIEW); + getPermissionChecker(), companyId, groupId, articleId, ActionKeys.VIEW); return JournalArticleLocalServiceUtil.getArticleContent( - companyId, articleId, version, languageId, themeDisplay); + companyId, groupId, articleId, version, languageId, themeDisplay); } public void deleteArticle( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String articleURL, PortletPreferences prefs) throws PortalException, SystemException { JournalArticlePermission.check( - getPermissionChecker(), companyId, articleId, ActionKeys.DELETE); + getPermissionChecker(), companyId, groupId, articleId, ActionKeys.DELETE); JournalArticleLocalServiceUtil.deleteArticle( - companyId, articleId, version, articleURL, prefs); + companyId, groupId, articleId, version, articleURL, prefs); } public void expireArticle( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String articleURL, PortletPreferences prefs) throws PortalException, SystemException { JournalArticlePermission.check( - getPermissionChecker(), companyId, articleId, ActionKeys.EXPIRE); + getPermissionChecker(), companyId, groupId, articleId, ActionKeys.EXPIRE); JournalArticleLocalServiceUtil.expireArticle( - companyId, articleId, version, articleURL, prefs); + companyId, groupId, articleId, version, articleURL, prefs); } public void removeArticleLocale(String companyId, String languageId) @@ -191,25 +191,25 @@ JournalArticle article = (JournalArticle)itr.next(); removeArticleLocale( - companyId, article.getArticleId(), article.getVersion(), + companyId, article.getGroupId(), article.getArticleId(), article.getVersion(), languageId); } } public JournalArticle removeArticleLocale( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String languageId) throws PortalException, SystemException { JournalArticlePermission.check( - getPermissionChecker(), companyId, articleId, ActionKeys.UPDATE); + getPermissionChecker(), companyId, groupId, articleId, ActionKeys.UPDATE); return JournalArticleLocalServiceUtil.removeArticleLocale( - companyId, articleId, version, languageId); + companyId, groupId, articleId, version, languageId); } public JournalArticle updateArticle( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, boolean incrementVersion, String title, String description, String content, String type, String structureId, String templateId, int displayDateMonth, int displayDateDay, int displayDateYear, @@ -223,10 +223,10 @@ throws PortalException, SystemException { JournalArticlePermission.check( - getPermissionChecker(), companyId, articleId, ActionKeys.UPDATE); + getPermissionChecker(), companyId, groupId, articleId, ActionKeys.UPDATE); return JournalArticleLocalServiceUtil.updateArticle( - getUserId(), articleId, version, incrementVersion, title, + getUserId(), groupId, articleId, version, incrementVersion, title, description, content, type, structureId, templateId, displayDateMonth, displayDateDay, displayDateYear, displayDateHour, displayDateMinute, expirationDateMonth, expirationDateDay, Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalTemplateLocalServiceImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalTemplateLocalServiceImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalTemplateLocalServiceImpl.java (working copy) @@ -103,8 +103,26 @@ smallFile, null, null, communityPermissions, guestPermissions); } + public JournalTemplate addTemplate( + String userId, String templateId, boolean autoTemplateId, + String plid, String structureId, String name, String description, + String xsl, boolean formatXsl, String langType, boolean smallImage, + String smallImageURL, File smallFile, + Boolean addCommunityPermissions, Boolean addGuestPermissions, + String[] communityPermissions, String[] guestPermissions) + throws PortalException, SystemException { + + return addTemplate( + userId, PortalUtil.getPortletGroupId(plid), templateId, autoTemplateId, + plid, structureId, name, description, + xsl, formatXsl, langType, smallImage, + smallImageURL, smallFile, + addCommunityPermissions, addGuestPermissions, + communityPermissions, guestPermissions); + } + public JournalTemplate addTemplate( - String userId, String templateId, boolean autoTemplateId, + String userId, String groupId, String templateId, boolean autoTemplateId, String plid, String structureId, String name, String description, String xsl, boolean formatXsl, String langType, boolean smallImage, String smallImageURL, File smallFile, @@ -116,7 +134,6 @@ User user = UserUtil.findByPrimaryKey(userId); templateId = templateId.trim().toUpperCase(); - String groupId = PortalUtil.getPortletGroupId(plid); Date now = new Date(); try { @@ -145,7 +162,7 @@ } validate( - user.getCompanyId(), templateId, autoTemplateId, name, description, + user.getCompanyId(), groupId, templateId, autoTemplateId, name, description, xsl, smallImage, smallImageURL, smallFile, smallBytes); if (autoTemplateId) { @@ -154,7 +171,7 @@ } JournalTemplatePK pk = new JournalTemplatePK( - user.getCompanyId(), templateId); + user.getCompanyId(), groupId, templateId); JournalTemplate template = JournalTemplateUtil.create(pk); @@ -197,12 +214,12 @@ } public void addTemplateResources( - String companyId, String templateId, + String companyId, String groupId, String templateId, boolean addCommunityPermissions, boolean addGuestPermissions) throws PortalException, SystemException { JournalTemplate template = JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); addTemplateResources( template, addCommunityPermissions, addGuestPermissions); @@ -221,12 +238,12 @@ } public void addTemplateResources( - String companyId, String templateId, String[] communityPermissions, + String companyId, String groupId, String templateId, String[] communityPermissions, String[] guestPermissions) throws PortalException, SystemException { JournalTemplate template = JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); addTemplateResources(template, communityPermissions, guestPermissions); } @@ -243,11 +260,11 @@ guestPermissions); } - public void checkNewLine(String companyId, String templateId) + public void checkNewLine(String companyId, String groupId, String templateId) throws PortalException, SystemException { JournalTemplate template = JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); String xsl = template.getXsl(); @@ -263,13 +280,13 @@ } } - public void deleteTemplate(String companyId, String templateId) + public void deleteTemplate(String companyId, String groupId, String templateId) throws PortalException, SystemException { templateId = templateId.trim().toUpperCase(); JournalTemplate template = JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); deleteTemplate(template); } @@ -277,8 +294,8 @@ public void deleteTemplate(JournalTemplate template) throws PortalException, SystemException { - if (JournalArticleUtil.countByC_T( - template.getCompanyId(), template.getTemplateId()) > 0) { + if (JournalArticleUtil.countByC_G_T( + template.getCompanyId(), template.getGroupId(), template.getTemplateId()) > 0) { throw new RequiredTemplateException(); } @@ -299,33 +316,33 @@ JournalTemplateUtil.remove(template.getPrimaryKey()); } - public List getStructureTemplates(String companyId, String structureId) + public List getStructureTemplates(String companyId, String groupId, String structureId) throws SystemException { - return JournalTemplateUtil.findByC_S(companyId, structureId); + return JournalTemplateUtil.findByC_G_S(companyId, groupId, structureId); } public List getStructureTemplates( - String companyId, String structureId, int begin, int end) + String companyId, String groupId, String structureId, int begin, int end) throws SystemException { - return JournalTemplateUtil.findByC_S( - companyId, structureId, begin, end); + return JournalTemplateUtil.findByC_G_S( + companyId, groupId, structureId, begin, end); } - public int getStructureTemplatesCount(String companyId, String structureId) + public int getStructureTemplatesCount(String companyId, String groupId, String structureId) throws SystemException { - return JournalTemplateUtil.countByC_S(companyId, structureId); + return JournalTemplateUtil.countByC_G_S(companyId, groupId, structureId); } - public JournalTemplate getTemplate(String companyId, String templateId) + public JournalTemplate getTemplate(String companyId, String groupId, String templateId) throws PortalException, SystemException { templateId = templateId.trim().toUpperCase(); return JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); } public List getTemplates(String groupId) throws SystemException { @@ -366,7 +383,7 @@ } public JournalTemplate updateTemplate( - String companyId, String templateId, String structureId, + String companyId, String groupId, String templateId, String structureId, String name, String description, String xsl, boolean formatXsl, String langType, boolean smallImage, String smallImageURL, File smallFile) @@ -406,7 +423,7 @@ smallBytes); JournalTemplate template = JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); template.setModifiedDate(new Date()); @@ -453,7 +470,7 @@ } protected void validate( - String companyId, String templateId, boolean autoTemplateId, + String companyId, String groupId, String templateId, boolean autoTemplateId, String name, String description, String xsl, boolean smallImage, String smallImageURL, File smallFile, byte[] smallBytes) throws PortalException, SystemException { @@ -468,7 +485,7 @@ try { JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); throw new DuplicateTemplateIdException(); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalStructureLocalServiceImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalStructureLocalServiceImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalStructureLocalServiceImpl.java (working copy) @@ -98,8 +98,23 @@ null, null, communityPermissions, guestPermissions); } + public JournalStructure addStructure( + String userId, String structureId, boolean autoStructureId, + String plid, String name, String description, String xsd, + Boolean addCommunityPermissions, Boolean addGuestPermissions, + String[] communityPermissions, String[] guestPermissions) + throws PortalException, SystemException { + + return addStructure( + userId, PortalUtil.getPortletGroupId(plid), structureId, autoStructureId, + plid, name, description, xsd, + addCommunityPermissions, addGuestPermissions, + communityPermissions, guestPermissions); + } + + public JournalStructure addStructure( - String userId, String structureId, boolean autoStructureId, + String userId, String groupId, String structureId, boolean autoStructureId, String plid, String name, String description, String xsd, Boolean addCommunityPermissions, Boolean addGuestPermissions, String[] communityPermissions, String[] guestPermissions) @@ -109,7 +124,6 @@ User user = UserUtil.findByPrimaryKey(userId); structureId = structureId.trim().toUpperCase(); - String groupId = PortalUtil.getPortletGroupId(plid); Date now = new Date(); try { @@ -123,7 +137,7 @@ } validate( - user.getCompanyId(), structureId, autoStructureId, name, + user.getCompanyId(), groupId, structureId, autoStructureId, name, description, xsd); if (autoStructureId) { @@ -132,7 +146,7 @@ } JournalStructurePK pk = new JournalStructurePK( - user.getCompanyId(), structureId); + user.getCompanyId(), groupId, structureId); JournalStructure structure = JournalStructureUtil.create(pk); @@ -166,12 +180,12 @@ } public void addStructureResources( - String companyId, String structureId, + String companyId, String groupId, String structureId, boolean addCommunityPermissions, boolean addGuestPermissions) throws PortalException, SystemException { JournalStructure structure = JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); addStructureResources( structure, addCommunityPermissions, addGuestPermissions); @@ -190,12 +204,12 @@ } public void addStructureResources( - String companyId, String structureId, String[] communityPermissions, + String companyId, String groupId, String structureId, String[] communityPermissions, String[] guestPermissions) throws PortalException, SystemException { JournalStructure structure = JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); addStructureResources( structure, communityPermissions, guestPermissions); @@ -213,11 +227,11 @@ guestPermissions); } - public void checkNewLine(String companyId, String structureId) + public void checkNewLine(String companyId, String groupId, String structureId) throws PortalException, SystemException { JournalStructure structure = JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); String xsd = structure.getXsd(); @@ -233,13 +247,13 @@ } } - public void deleteStructure(String companyId, String structureId) + public void deleteStructure(String companyId, String groupId, String structureId) throws PortalException, SystemException { structureId = structureId.trim().toUpperCase(); JournalStructure structure = JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); deleteStructure(structure); } @@ -247,14 +261,14 @@ public void deleteStructure(JournalStructure structure) throws PortalException, SystemException { - if (JournalArticleUtil.countByC_S( - structure.getCompanyId(), structure.getStructureId()) > 0) { + if (JournalArticleUtil.countByC_G_S( + structure.getCompanyId(), structure.getGroupId(), structure.getStructureId()) > 0) { throw new RequiredStructureException(); } - if (JournalTemplateUtil.countByC_S( - structure.getCompanyId(), structure.getStructureId()) > 0) { + if (JournalTemplateUtil.countByC_G_S( + structure.getCompanyId(), structure.getGroupId(), structure.getStructureId()) > 0) { throw new RequiredStructureException(); } @@ -271,13 +285,13 @@ JournalStructureUtil.remove(structure.getPrimaryKey()); } - public JournalStructure getStructure(String companyId, String structureId) + public JournalStructure getStructure(String companyId, String groupId, String structureId) throws PortalException, SystemException { structureId = structureId.trim().toUpperCase(); return JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); } public List getStructures(String groupId) throws SystemException { @@ -315,7 +329,7 @@ } public JournalStructure updateStructure( - String companyId, String structureId, String name, + String companyId, String groupId, String structureId, String name, String description, String xsd) throws PortalException, SystemException { @@ -334,7 +348,7 @@ validate(name, description, xsd); JournalStructure structure = JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); structure.setModifiedDate(new Date()); structure.setName(name); @@ -347,7 +361,7 @@ } protected void validate( - String companyId, String structureId, boolean autoStructureId, + String companyId, String groupId, String structureId, boolean autoStructureId, String name, String description, String xsd) throws PortalException, SystemException { @@ -361,7 +375,7 @@ try { JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); throw new DuplicateStructureIdException(); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalTemplateServiceImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalTemplateServiceImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalTemplateServiceImpl.java (working copy) @@ -81,27 +81,27 @@ smallFile, communityPermissions, guestPermissions); } - public void deleteTemplate(String companyId, String templateId) + public void deleteTemplate(String companyId, String groupId, String templateId) throws PortalException, SystemException { JournalTemplatePermission.check( - getPermissionChecker(), companyId, templateId, ActionKeys.DELETE); + getPermissionChecker(), companyId, groupId, templateId, ActionKeys.DELETE); - JournalTemplateLocalServiceUtil.deleteTemplate(companyId, templateId); + JournalTemplateLocalServiceUtil.deleteTemplate(companyId, groupId, templateId); } - public JournalTemplate getTemplate(String companyId, String templateId) + public JournalTemplate getTemplate(String companyId, String groupId, String templateId) throws PortalException, SystemException { JournalTemplatePermission.check( - getPermissionChecker(), companyId, templateId, ActionKeys.VIEW); + getPermissionChecker(), companyId, groupId, templateId, ActionKeys.VIEW); return JournalTemplateLocalServiceUtil.getTemplate( - companyId, templateId); + companyId, groupId, templateId); } public JournalTemplate updateTemplate( - String templateId, String structureId, String name, + String groupId, String templateId, String structureId, String name, String description, String xsl, boolean formatXsl, String langType, boolean smallImage, String smallImageURL, File smallFile) throws PortalException, SystemException { @@ -109,11 +109,11 @@ User user = getUser(); JournalTemplatePermission.check( - getPermissionChecker(), user.getCompanyId(), templateId, + getPermissionChecker(), user.getCompanyId(), groupId, templateId, ActionKeys.UPDATE); return JournalTemplateLocalServiceUtil.updateTemplate( - user.getCompanyId(), templateId, structureId, name, description, + user.getCompanyId(), groupId, templateId, structureId, name, description, xsl, formatXsl, langType, smallImage, smallImageURL, smallFile); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalArticleLocalServiceImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalArticleLocalServiceImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalArticleLocalServiceImpl.java (working copy) @@ -172,8 +172,36 @@ null, communityPermissions, guestPermissions); } + public JournalArticle addArticle( + String userId, String articleId, boolean autoArticleId, + String plid, String title, String description, String content, + String type, String structureId, String templateId, + int displayDateMonth, int displayDateDay, int displayDateYear, + int displayDateHour, int displayDateMinute, int expirationDateMonth, + int expirationDateDay, int expirationDateYear, + int expirationDateHour, int expirationDateMinute, + boolean neverExpire, int reviewDateMonth, int reviewDateDay, + int reviewDateYear, int reviewDateHour, int reviewDateMinute, + boolean neverReview, Map images, String articleURL, + PortletPreferences prefs, Boolean addCommunityPermissions, + Boolean addGuestPermissions, String[] communityPermissions, + String[] guestPermissions) + throws PortalException, SystemException { + + return addArticle( + userId, PortalUtil.getPortletGroupId(plid), articleId, autoArticleId, + plid, title, description, content, + type, structureId, templateId, displayDateMonth, displayDateDay, + displayDateYear, displayDateHour, displayDateMinute, + expirationDateMonth, expirationDateDay, expirationDateYear, + expirationDateHour, expirationDateMinute, neverExpire, + reviewDateMonth, reviewDateDay, reviewDateYear, reviewDateHour, + reviewDateMinute, neverReview, images, articleURL, prefs, addCommunityPermissions, + addGuestPermissions, communityPermissions, guestPermissions); + } + public JournalArticle addArticle( - String userId, String articleId, boolean autoArticleId, + String userId, String groupId, String articleId, boolean autoArticleId, String plid, String title, String description, String content, String type, String structureId, String templateId, int displayDateMonth, int displayDateDay, int displayDateYear, @@ -192,7 +220,6 @@ User user = UserUtil.findByPrimaryKey(userId); articleId = articleId.trim().toUpperCase(); - String groupId = PortalUtil.getPortletGroupId(plid); Date now = new Date(); Date displayDate = PortalUtil.getDate( @@ -219,7 +246,7 @@ } validate( - user.getCompanyId(), articleId, autoArticleId, title, content, + user.getCompanyId(), groupId, articleId, autoArticleId, title, content, structureId, templateId); if (autoArticleId) { @@ -228,7 +255,7 @@ } JournalArticlePK pk = new JournalArticlePK( - user.getCompanyId(), articleId, JournalArticleImpl.DEFAULT_VERSION); + user.getCompanyId(), groupId, articleId, JournalArticleImpl.DEFAULT_VERSION); JournalArticle article = JournalArticleUtil.create(pk); @@ -277,11 +304,11 @@ } public void addArticleResources( - String companyId, String articleId, boolean addCommunityPermissions, + String companyId, String groupId, String articleId, boolean addCommunityPermissions, boolean addGuestPermissions) throws PortalException, SystemException { - JournalArticle article = getLatestArticle(companyId, articleId); + JournalArticle article = getLatestArticle(companyId, groupId, articleId); addArticleResources( article, addCommunityPermissions, addGuestPermissions); @@ -300,11 +327,11 @@ } public void addArticleResources( - String companyId, String articleId, String[] communityPermissions, + String companyId, String groupId, String articleId, String[] communityPermissions, String[] guestPermissions) throws PortalException, SystemException { - JournalArticle article = getLatestArticle(companyId, articleId); + JournalArticle article = getLatestArticle(companyId, groupId, articleId); addArticleResources(article, communityPermissions, guestPermissions); } @@ -322,7 +349,7 @@ } public JournalArticle approveArticle( - String userId, String articleId, double version, String articleURL, + String userId, String groupId, String articleId, double version, String articleURL, PortletPreferences prefs) throws PortalException, SystemException { @@ -332,7 +359,7 @@ Date now = new Date(); JournalArticlePK pk = new JournalArticlePK( - user.getCompanyId(), articleId, version); + user.getCompanyId(), groupId, articleId, version); JournalArticle article = JournalArticleUtil.findByPrimaryKey(pk); @@ -408,12 +435,12 @@ } } - public void checkNewLine(String companyId, String articleId, double version) + public void checkNewLine(String companyId, String groupId, String articleId, double version) throws PortalException, SystemException { JournalArticle article = JournalArticleUtil.findByPrimaryKey(new JournalArticlePK( - companyId, articleId, JournalArticleImpl.DEFAULT_VERSION)); + companyId, groupId, articleId, JournalArticleImpl.DEFAULT_VERSION)); String content = article.getContent(); @@ -430,13 +457,13 @@ } public void deleteArticle( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String articleURL, PortletPreferences prefs) throws PortalException, SystemException { JournalArticle article = JournalArticleUtil.findByPrimaryKey(new JournalArticlePK( - companyId, articleId, version)); + companyId, groupId, articleId, version)); deleteArticle(article, articleURL, prefs); } @@ -461,7 +488,7 @@ if ((prefs != null) && !article.isApproved() && isLatestVersion( - article.getCompanyId(), article.getArticleId(), + article.getCompanyId(), article.getGroupId(), article.getArticleId(), article.getVersion())) { sendEmail(article, articleURL, prefs, "denied"); @@ -480,8 +507,8 @@ // Resources - if (JournalArticleUtil.countByC_A( - article.getCompanyId(), article.getArticleId()) == 1) { + if (JournalArticleUtil.countByC_G_A( + article.getCompanyId(), article.getGroupId(), article.getArticleId()) == 1) { ResourceLocalServiceUtil.deleteResource( article.getCompanyId(), JournalArticle.class.getName(), @@ -507,13 +534,13 @@ } public void expireArticle( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String articleURL, PortletPreferences prefs) throws PortalException, SystemException { JournalArticle article = JournalArticleUtil.findByPrimaryKey(new JournalArticlePK( - companyId, articleId, version)); + companyId, groupId, articleId, version)); expireArticle(article, articleURL, prefs); } @@ -526,7 +553,7 @@ if ((prefs != null) && !article.isApproved() && isLatestVersion( - article.getCompanyId(), article.getArticleId(), + article.getCompanyId(), article.getGroupId(), article.getArticleId(), article.getVersion())) { sendEmail(article, articleURL, prefs, "denied"); @@ -542,48 +569,48 @@ JournalArticleUtil.update(article); } - public JournalArticle getArticle(String companyId, String articleId) + public JournalArticle getArticle(String companyId, String groupId, String articleId) throws PortalException, SystemException { // Get the latest article that is approved, if none are approved, get // the latest unapproved article try { - return getLatestArticle(companyId, articleId, Boolean.TRUE); + return getLatestArticle(companyId, groupId, articleId, Boolean.TRUE); } catch (NoSuchArticleException nsae) { - return getLatestArticle(companyId, articleId, Boolean.FALSE); + return getLatestArticle(companyId, groupId, articleId, Boolean.FALSE); } } public JournalArticle getArticle( - String companyId, String articleId, double version) + String companyId, String groupId, String articleId, double version) throws PortalException, SystemException { return JournalArticleUtil.findByPrimaryKey( - new JournalArticlePK(companyId, articleId, version)); + new JournalArticlePK(companyId, groupId, articleId, version)); } public String getArticleContent( - String companyId, String articleId, String languageId, + String companyId, String groupId, String articleId, String languageId, ThemeDisplay themeDisplay) throws PortalException, SystemException { - JournalArticle article = getDisplayArticle(companyId, articleId); + JournalArticle article = getDisplayArticle(companyId, groupId, articleId); return getArticleContent( - companyId, articleId, article.getVersion(), languageId, + companyId, groupId, articleId, article.getVersion(), languageId, themeDisplay); } public String getArticleContent( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String languageId, ThemeDisplay themeDisplay) throws PortalException, SystemException { JournalArticle article = JournalArticleUtil.findByPrimaryKey(new JournalArticlePK( - companyId, articleId, version)); + companyId, groupId, articleId, version)); /*if (!article.isTemplateDriven()) { return article.getContent(); @@ -686,7 +713,7 @@ if (article.isTemplateDriven()) { JournalTemplate template = JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, article.getTemplateId())); + new JournalTemplatePK(companyId, groupId, article.getTemplateId())); script = template.getXsl(); langType = template.getLangType(); @@ -721,11 +748,11 @@ return JournalArticleUtil.countByGroupId(groupId); } - public JournalArticle getDisplayArticle(String companyId, String articleId) + public JournalArticle getDisplayArticle(String companyId, String groupId, String articleId) throws PortalException, SystemException { - List articles = JournalArticleUtil.findByC_A_A( - companyId, articleId, true); + List articles = JournalArticleUtil.findByC_G_A_A( + companyId, groupId, articleId, true); if (articles.size() == 0) { throw new NoSuchArticleException(); @@ -746,24 +773,24 @@ return (JournalArticle)articles.get(0); } - public JournalArticle getLatestArticle(String companyId, String articleId) + public JournalArticle getLatestArticle(String companyId, String groupId, String articleId) throws PortalException, SystemException { - return getLatestArticle(companyId, articleId, null); + return getLatestArticle(companyId, groupId, articleId, null); } public JournalArticle getLatestArticle( - String companyId, String articleId, Boolean approved) + String companyId, String groupId, String articleId, Boolean approved) throws PortalException, SystemException { List articles = null; if (approved == null) { - articles = JournalArticleUtil.findByC_A(companyId, articleId, 0, 1); + articles = JournalArticleUtil.findByC_G_A(companyId, groupId, articleId, 0, 1); } else { - articles = JournalArticleUtil.findByC_A_A( - companyId, articleId, approved.booleanValue(), 0, 1); + articles = JournalArticleUtil.findByC_G_A_A( + companyId, groupId, articleId, approved.booleanValue(), 0, 1); } if (articles.size() == 0) { @@ -773,61 +800,61 @@ return (JournalArticle)articles.get(0); } - public double getLatestVersion(String companyId, String articleId) + public double getLatestVersion(String companyId, String groupId, String articleId) throws PortalException, SystemException { - JournalArticle article = getLatestArticle(companyId, articleId); + JournalArticle article = getLatestArticle(companyId, groupId, articleId); return article.getVersion(); } - public List getStructureArticles(String companyId, String structureId) + public List getStructureArticles(String companyId, String groupId, String structureId) throws SystemException { - return JournalArticleUtil.findByC_S(companyId, structureId); + return JournalArticleUtil.findByC_G_S(companyId, groupId, structureId); } public List getStructureArticles( - String companyId, String structureId, int begin, int end, + String companyId, String groupId, String structureId, int begin, int end, OrderByComparator obc) throws SystemException { - return JournalArticleUtil.findByC_S( - companyId, structureId, begin, end, obc); + return JournalArticleUtil.findByC_G_S( + companyId, groupId, structureId, begin, end, obc); } - public int getStructureArticlesCount(String companyId, String structureId) + public int getStructureArticlesCount(String companyId, String groupId, String structureId) throws SystemException { - return JournalArticleUtil.countByC_S(companyId, structureId); + return JournalArticleUtil.countByC_G_S(companyId, groupId, structureId); } - public List getTemplateArticles(String companyId, String templateId) + public List getTemplateArticles(String companyId, String groupId, String templateId) throws SystemException { - return JournalArticleUtil.findByC_T(companyId, templateId); + return JournalArticleUtil.findByC_G_T(companyId, groupId, templateId); } public List getTemplateArticles( - String companyId, String templateId, int begin, int end, + String companyId, String groupId, String templateId, int begin, int end, OrderByComparator obc) throws SystemException { - return JournalArticleUtil.findByC_T( - companyId, templateId, begin, end, obc); + return JournalArticleUtil.findByC_G_T( + companyId, groupId, templateId, begin, end, obc); } - public int getTemplateArticlesCount(String companyId, String templateId) + public int getTemplateArticlesCount(String companyId, String groupId, String templateId) throws SystemException { - return JournalArticleUtil.countByC_T(companyId, templateId); + return JournalArticleUtil.countByC_G_T(companyId, groupId, templateId); } public boolean isLatestVersion( - String companyId, String articleId, double version) + String companyId, String groupId, String articleId, double version) throws PortalException, SystemException { - if (getLatestVersion(companyId, articleId) == version) { + if (getLatestVersion(companyId, groupId, articleId) == version) { return true; } else { @@ -878,12 +905,12 @@ } public JournalArticle removeArticleLocale( - String companyId, String articleId, double version, + String companyId, String groupId, String articleId, double version, String languageId) throws PortalException, SystemException { JournalArticle article = JournalArticleUtil.findByPrimaryKey( - new JournalArticlePK(companyId, articleId, version)); + new JournalArticlePK(companyId, groupId, articleId, version)); if (Validator.isNotNull(article.getStructureId())) { String content = JournalUtil.removeArticleLocale( @@ -990,7 +1017,7 @@ } public JournalArticle updateArticle( - String userId, String articleId, double version, + String userId, String groupId, String articleId, double version, boolean incrementVersion, String title, String description, String content, String type, String structureId, String templateId, int displayDateMonth, int displayDateDay, int displayDateYear, @@ -1033,10 +1060,10 @@ } validate( - user.getCompanyId(), title, content, structureId, templateId); + user.getCompanyId(), title, content, groupId, structureId, templateId); JournalArticlePK oldPK = new JournalArticlePK( - user.getCompanyId(), articleId, version); + user.getCompanyId(), groupId, articleId, version); JournalArticle oldArticle = JournalArticleUtil.findByPrimaryKey(oldPK); @@ -1044,10 +1071,10 @@ if (incrementVersion) { double latestVersion = getLatestVersion( - user.getCompanyId(), articleId); + user.getCompanyId(), groupId, articleId); JournalArticlePK pk = new JournalArticlePK( - user.getCompanyId(), articleId, + user.getCompanyId(), groupId, articleId, MathUtil.format(latestVersion + 0.1, 1, 1)); article = JournalArticleUtil.create(pk); @@ -1446,7 +1473,7 @@ } protected void validate( - String companyId, String articleId, boolean autoArticleId, + String companyId, String groupId, String articleId, boolean autoArticleId, String title, String content, String structureId, String templateId) throws PortalException, SystemException { @@ -1460,7 +1487,7 @@ try { JournalArticleUtil.findByPrimaryKey(new JournalArticlePK( - companyId, articleId, JournalArticleImpl.DEFAULT_VERSION)); + companyId, groupId, articleId, JournalArticleImpl.DEFAULT_VERSION)); throw new DuplicateArticleIdException(); } @@ -1468,11 +1495,11 @@ } } - validate(companyId, title, content, structureId, templateId); + validate(companyId, title, content, groupId, structureId, templateId); } protected void validate( - String companyId, String title, String content, String structureId, + String companyId, String title, String content, String groupId, String structureId, String templateId) throws PortalException, SystemException { @@ -1485,10 +1512,10 @@ if (Validator.isNotNull(structureId)) { JournalStructureUtil.findByPrimaryKey( - new JournalStructurePK(companyId, structureId)); + new JournalStructurePK(companyId, groupId, structureId)); JournalTemplate template = JournalTemplateUtil.findByPrimaryKey( - new JournalTemplatePK(companyId, templateId)); + new JournalTemplatePK(companyId, groupId, templateId)); if (!template.getStructureId().equals(structureId)) { throw new NoSuchTemplateException(); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalStructureServiceImpl.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalStructureServiceImpl.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/impl/JournalStructureServiceImpl.java (working copy) @@ -73,38 +73,38 @@ xsd, communityPermissions, guestPermissions); } - public void deleteStructure(String companyId, String structureId) + public void deleteStructure(String companyId, String groupId, String structureId) throws PortalException, SystemException { JournalStructurePermission.check( - getPermissionChecker(), companyId, structureId, ActionKeys.DELETE); + getPermissionChecker(), companyId, groupId, structureId, ActionKeys.DELETE); JournalStructureLocalServiceUtil.deleteStructure( - companyId, structureId); + companyId, groupId, structureId); } - public JournalStructure getStructure(String companyId, String structureId) + public JournalStructure getStructure(String companyId, String groupId, String structureId) throws PortalException, SystemException { JournalStructurePermission.check( - getPermissionChecker(), companyId, structureId, ActionKeys.VIEW); + getPermissionChecker(), companyId, groupId, structureId, ActionKeys.VIEW); return JournalStructureLocalServiceUtil.getStructure( - companyId, structureId); + companyId, groupId, structureId); } public JournalStructure updateStructure( - String structureId, String name, String description, String xsd) + String groupId, String structureId, String name, String description, String xsd) throws PortalException, SystemException { User user = getUser(); JournalStructurePermission.check( - getPermissionChecker(), user.getCompanyId(), structureId, + getPermissionChecker(), user.getCompanyId(), groupId, structureId, ActionKeys.UPDATE); return JournalStructureLocalServiceUtil.updateStructure( - user.getCompanyId(), structureId, name, description, xsd); + user.getCompanyId(), groupId, structureId, name, description, xsd); } } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalArticlePersistence.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalArticlePersistence.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalArticlePersistence.java (working copy) @@ -554,7 +554,7 @@ } } - public List findByC_A(String companyId, String articleId) + public List findByC_G_A(String companyId, String groupId, String articleId) throws SystemException { Session session = null; @@ -574,6 +574,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -595,6 +604,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } @@ -609,13 +622,13 @@ } } - public List findByC_A(String companyId, String articleId, int begin, int end) - throws SystemException { - return findByC_A(companyId, articleId, begin, end, null); + public List findByC_G_A(String companyId, String groupId, String articleId, + int begin, int end) throws SystemException { + return findByC_G_A(companyId, groupId, articleId, begin, end, null); } - public List findByC_A(String companyId, String articleId, int begin, - int end, OrderByComparator obc) throws SystemException { + public List findByC_G_A(String companyId, String groupId, String articleId, + int begin, int end, OrderByComparator obc) throws SystemException { Session session = null; try { @@ -634,6 +647,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -661,6 +683,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } @@ -675,9 +701,10 @@ } } - public JournalArticle findByC_A_First(String companyId, String articleId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { - List list = findByC_A(companyId, articleId, 0, 1, obc); + public JournalArticle findByC_G_A_First(String companyId, String groupId, + String articleId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { + List list = findByC_G_A(companyId, groupId, articleId, 0, 1, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -685,6 +712,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "articleId="; msg += articleId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -695,10 +725,12 @@ } } - public JournalArticle findByC_A_Last(String companyId, String articleId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { - int count = countByC_A(companyId, articleId); - List list = findByC_A(companyId, articleId, count - 1, count, obc); + public JournalArticle findByC_G_A_Last(String companyId, String groupId, + String articleId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { + int count = countByC_G_A(companyId, groupId, articleId); + List list = findByC_G_A(companyId, groupId, articleId, count - 1, + count, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -706,6 +738,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "articleId="; msg += articleId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -716,11 +751,12 @@ } } - public JournalArticle[] findByC_A_PrevAndNext( - JournalArticlePK journalArticlePK, String companyId, String articleId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { + public JournalArticle[] findByC_G_A_PrevAndNext( + JournalArticlePK journalArticlePK, String companyId, String groupId, + String articleId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { JournalArticle journalArticle = findByPrimaryKey(journalArticlePK); - int count = countByC_A(companyId, articleId); + int count = countByC_G_A(companyId, groupId, articleId); Session session = null; try { @@ -739,6 +775,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -766,6 +811,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } @@ -787,7 +836,7 @@ } } - public List findByC_S(String companyId, String structureId) + public List findByC_G_S(String companyId, String groupId, String structureId) throws SystemException { Session session = null; @@ -807,6 +856,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -828,6 +886,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } @@ -842,13 +904,14 @@ } } - public List findByC_S(String companyId, String structureId, int begin, - int end) throws SystemException { - return findByC_S(companyId, structureId, begin, end, null); + public List findByC_G_S(String companyId, String groupId, + String structureId, int begin, int end) throws SystemException { + return findByC_G_S(companyId, groupId, structureId, begin, end, null); } - public List findByC_S(String companyId, String structureId, int begin, - int end, OrderByComparator obc) throws SystemException { + public List findByC_G_S(String companyId, String groupId, + String structureId, int begin, int end, OrderByComparator obc) + throws SystemException { Session session = null; try { @@ -867,6 +930,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -894,6 +966,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } @@ -908,9 +984,10 @@ } } - public JournalArticle findByC_S_First(String companyId, String structureId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { - List list = findByC_S(companyId, structureId, 0, 1, obc); + public JournalArticle findByC_G_S_First(String companyId, String groupId, + String structureId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { + List list = findByC_G_S(companyId, groupId, structureId, 0, 1, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -918,6 +995,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "structureId="; msg += structureId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -928,10 +1008,12 @@ } } - public JournalArticle findByC_S_Last(String companyId, String structureId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { - int count = countByC_S(companyId, structureId); - List list = findByC_S(companyId, structureId, count - 1, count, obc); + public JournalArticle findByC_G_S_Last(String companyId, String groupId, + String structureId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { + int count = countByC_G_S(companyId, groupId, structureId); + List list = findByC_G_S(companyId, groupId, structureId, count - 1, + count, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -939,6 +1021,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "structureId="; msg += structureId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -949,12 +1034,12 @@ } } - public JournalArticle[] findByC_S_PrevAndNext( - JournalArticlePK journalArticlePK, String companyId, + public JournalArticle[] findByC_G_S_PrevAndNext( + JournalArticlePK journalArticlePK, String companyId, String groupId, String structureId, OrderByComparator obc) throws NoSuchArticleException, SystemException { JournalArticle journalArticle = findByPrimaryKey(journalArticlePK); - int count = countByC_S(companyId, structureId); + int count = countByC_G_S(companyId, groupId, structureId); Session session = null; try { @@ -973,6 +1058,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -1000,6 +1094,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } @@ -1021,7 +1119,7 @@ } } - public List findByC_T(String companyId, String templateId) + public List findByC_G_T(String companyId, String groupId, String templateId) throws SystemException { Session session = null; @@ -1041,6 +1139,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (templateId == null) { query.append("templateId IS NULL"); } @@ -1062,6 +1169,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (templateId != null) { q.setString(queryPos++, templateId); } @@ -1076,13 +1187,14 @@ } } - public List findByC_T(String companyId, String templateId, int begin, - int end) throws SystemException { - return findByC_T(companyId, templateId, begin, end, null); + public List findByC_G_T(String companyId, String groupId, + String templateId, int begin, int end) throws SystemException { + return findByC_G_T(companyId, groupId, templateId, begin, end, null); } - public List findByC_T(String companyId, String templateId, int begin, - int end, OrderByComparator obc) throws SystemException { + public List findByC_G_T(String companyId, String groupId, + String templateId, int begin, int end, OrderByComparator obc) + throws SystemException { Session session = null; try { @@ -1101,6 +1213,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (templateId == null) { query.append("templateId IS NULL"); } @@ -1128,6 +1249,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (templateId != null) { q.setString(queryPos++, templateId); } @@ -1142,9 +1267,10 @@ } } - public JournalArticle findByC_T_First(String companyId, String templateId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { - List list = findByC_T(companyId, templateId, 0, 1, obc); + public JournalArticle findByC_G_T_First(String companyId, String groupId, + String templateId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { + List list = findByC_G_T(companyId, groupId, templateId, 0, 1, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -1152,6 +1278,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "templateId="; msg += templateId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -1162,10 +1291,12 @@ } } - public JournalArticle findByC_T_Last(String companyId, String templateId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { - int count = countByC_T(companyId, templateId); - List list = findByC_T(companyId, templateId, count - 1, count, obc); + public JournalArticle findByC_G_T_Last(String companyId, String groupId, + String templateId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { + int count = countByC_G_T(companyId, groupId, templateId); + List list = findByC_G_T(companyId, groupId, templateId, count - 1, + count, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -1173,6 +1304,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "templateId="; msg += templateId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -1183,11 +1317,12 @@ } } - public JournalArticle[] findByC_T_PrevAndNext( - JournalArticlePK journalArticlePK, String companyId, String templateId, - OrderByComparator obc) throws NoSuchArticleException, SystemException { + public JournalArticle[] findByC_G_T_PrevAndNext( + JournalArticlePK journalArticlePK, String companyId, String groupId, + String templateId, OrderByComparator obc) + throws NoSuchArticleException, SystemException { JournalArticle journalArticle = findByPrimaryKey(journalArticlePK); - int count = countByC_T(companyId, templateId); + int count = countByC_G_T(companyId, groupId, templateId); Session session = null; try { @@ -1206,6 +1341,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (templateId == null) { query.append("templateId IS NULL"); } @@ -1233,6 +1377,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (templateId != null) { q.setString(queryPos++, templateId); } @@ -1254,8 +1402,8 @@ } } - public List findByC_A_A(String companyId, String articleId, boolean approved) - throws SystemException { + public List findByC_G_A_A(String companyId, String groupId, + String articleId, boolean approved) throws SystemException { Session session = null; try { @@ -1274,6 +1422,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -1297,6 +1454,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } @@ -1313,14 +1474,16 @@ } } - public List findByC_A_A(String companyId, String articleId, - boolean approved, int begin, int end) throws SystemException { - return findByC_A_A(companyId, articleId, approved, begin, end, null); + public List findByC_G_A_A(String companyId, String groupId, + String articleId, boolean approved, int begin, int end) + throws SystemException { + return findByC_G_A_A(companyId, groupId, articleId, approved, begin, + end, null); } - public List findByC_A_A(String companyId, String articleId, - boolean approved, int begin, int end, OrderByComparator obc) - throws SystemException { + public List findByC_G_A_A(String companyId, String groupId, + String articleId, boolean approved, int begin, int end, + OrderByComparator obc) throws SystemException { Session session = null; try { @@ -1339,6 +1502,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -1368,6 +1540,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } @@ -1384,10 +1560,11 @@ } } - public JournalArticle findByC_A_A_First(String companyId, String articleId, - boolean approved, OrderByComparator obc) + public JournalArticle findByC_G_A_A_First(String companyId, String groupId, + String articleId, boolean approved, OrderByComparator obc) throws NoSuchArticleException, SystemException { - List list = findByC_A_A(companyId, articleId, approved, 0, 1, obc); + List list = findByC_G_A_A(companyId, groupId, articleId, approved, 0, + 1, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -1395,6 +1572,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "articleId="; msg += articleId; msg += ", "; @@ -1408,12 +1588,12 @@ } } - public JournalArticle findByC_A_A_Last(String companyId, String articleId, - boolean approved, OrderByComparator obc) + public JournalArticle findByC_G_A_A_Last(String companyId, String groupId, + String articleId, boolean approved, OrderByComparator obc) throws NoSuchArticleException, SystemException { - int count = countByC_A_A(companyId, articleId, approved); - List list = findByC_A_A(companyId, articleId, approved, count - 1, - count, obc); + int count = countByC_G_A_A(companyId, groupId, articleId, approved); + List list = findByC_G_A_A(companyId, groupId, articleId, approved, + count - 1, count, obc); if (list.size() == 0) { String msg = "No JournalArticle exists with the key "; @@ -1421,6 +1601,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "articleId="; msg += articleId; msg += ", "; @@ -1434,12 +1617,12 @@ } } - public JournalArticle[] findByC_A_A_PrevAndNext( - JournalArticlePK journalArticlePK, String companyId, String articleId, - boolean approved, OrderByComparator obc) + public JournalArticle[] findByC_G_A_A_PrevAndNext( + JournalArticlePK journalArticlePK, String companyId, String groupId, + String articleId, boolean approved, OrderByComparator obc) throws NoSuchArticleException, SystemException { JournalArticle journalArticle = findByPrimaryKey(journalArticlePK); - int count = countByC_A_A(companyId, articleId, approved); + int count = countByC_G_A_A(companyId, groupId, articleId, approved); Session session = null; try { @@ -1458,6 +1641,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -1487,6 +1679,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } @@ -1569,9 +1765,9 @@ } } - public void removeByC_A(String companyId, String articleId) + public void removeByC_G_A(String companyId, String groupId, String articleId) throws SystemException { - Iterator itr = findByC_A(companyId, articleId).iterator(); + Iterator itr = findByC_G_A(companyId, groupId, articleId).iterator(); while (itr.hasNext()) { JournalArticle journalArticle = (JournalArticle)itr.next(); @@ -1579,9 +1775,9 @@ } } - public void removeByC_S(String companyId, String structureId) - throws SystemException { - Iterator itr = findByC_S(companyId, structureId).iterator(); + public void removeByC_G_S(String companyId, String groupId, + String structureId) throws SystemException { + Iterator itr = findByC_G_S(companyId, groupId, structureId).iterator(); while (itr.hasNext()) { JournalArticle journalArticle = (JournalArticle)itr.next(); @@ -1589,9 +1785,9 @@ } } - public void removeByC_T(String companyId, String templateId) - throws SystemException { - Iterator itr = findByC_T(companyId, templateId).iterator(); + public void removeByC_G_T(String companyId, String groupId, + String templateId) throws SystemException { + Iterator itr = findByC_G_T(companyId, groupId, templateId).iterator(); while (itr.hasNext()) { JournalArticle journalArticle = (JournalArticle)itr.next(); @@ -1599,9 +1795,10 @@ } } - public void removeByC_A_A(String companyId, String articleId, - boolean approved) throws SystemException { - Iterator itr = findByC_A_A(companyId, articleId, approved).iterator(); + public void removeByC_G_A_A(String companyId, String groupId, + String articleId, boolean approved) throws SystemException { + Iterator itr = findByC_G_A_A(companyId, groupId, articleId, approved) + .iterator(); while (itr.hasNext()) { JournalArticle journalArticle = (JournalArticle)itr.next(); @@ -1707,7 +1904,7 @@ } } - public int countByC_A(String companyId, String articleId) + public int countByC_G_A(String companyId, String groupId, String articleId) throws SystemException { Session session = null; @@ -1728,6 +1925,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -1746,6 +1952,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } @@ -1770,7 +1980,7 @@ } } - public int countByC_S(String companyId, String structureId) + public int countByC_G_S(String companyId, String groupId, String structureId) throws SystemException { Session session = null; @@ -1791,6 +2001,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -1809,6 +2028,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } @@ -1833,7 +2056,7 @@ } } - public int countByC_T(String companyId, String templateId) + public int countByC_G_T(String companyId, String groupId, String templateId) throws SystemException { Session session = null; @@ -1854,6 +2077,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (templateId == null) { query.append("templateId IS NULL"); } @@ -1872,6 +2104,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (templateId != null) { q.setString(queryPos++, templateId); } @@ -1896,8 +2132,8 @@ } } - public int countByC_A_A(String companyId, String articleId, boolean approved) - throws SystemException { + public int countByC_G_A_A(String companyId, String groupId, + String articleId, boolean approved) throws SystemException { Session session = null; try { @@ -1917,6 +2153,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (articleId == null) { query.append("articleId IS NULL"); } @@ -1937,6 +2182,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (articleId != null) { q.setString(queryPos++, articleId); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalTemplateUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalTemplateUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalTemplateUtil.java (working copy) @@ -194,49 +194,56 @@ groupId, obc); } - public static java.util.List findByC_S(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { - return getPersistence().findByC_S(companyId, structureId); + public static java.util.List findByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_S(companyId, groupId, structureId); } - public static java.util.List findByC_S(java.lang.String companyId, - java.lang.String structureId, int begin, int end) - throws com.liferay.portal.SystemException { - return getPersistence().findByC_S(companyId, structureId, begin, end); + public static java.util.List findByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId, int begin, + int end) throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_S(companyId, groupId, structureId, + begin, end); } - public static java.util.List findByC_S(java.lang.String companyId, - java.lang.String structureId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + public static java.util.List findByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { - return getPersistence().findByC_S(companyId, structureId, begin, end, - obc); + return getPersistence().findByC_G_S(companyId, groupId, structureId, + begin, end, obc); } - public static com.liferay.portlet.journal.model.JournalTemplate findByC_S_First( - java.lang.String companyId, java.lang.String structureId, + public static com.liferay.portlet.journal.model.JournalTemplate findByC_G_S_First( + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchTemplateException { - return getPersistence().findByC_S_First(companyId, structureId, obc); + return getPersistence().findByC_G_S_First(companyId, groupId, + structureId, obc); } - public static com.liferay.portlet.journal.model.JournalTemplate findByC_S_Last( - java.lang.String companyId, java.lang.String structureId, + public static com.liferay.portlet.journal.model.JournalTemplate findByC_G_S_Last( + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchTemplateException { - return getPersistence().findByC_S_Last(companyId, structureId, obc); + return getPersistence().findByC_G_S_Last(companyId, groupId, + structureId, obc); } - public static com.liferay.portlet.journal.model.JournalTemplate[] findByC_S_PrevAndNext( + public static com.liferay.portlet.journal.model.JournalTemplate[] findByC_G_S_PrevAndNext( com.liferay.portlet.journal.service.persistence.JournalTemplatePK journalTemplatePK, - java.lang.String companyId, java.lang.String structureId, + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchTemplateException { - return getPersistence().findByC_S_PrevAndNext(journalTemplatePK, - companyId, structureId, obc); + return getPersistence().findByC_G_S_PrevAndNext(journalTemplatePK, + companyId, groupId, structureId, obc); } public static java.util.List findAll() @@ -260,9 +267,10 @@ getPersistence().removeByGroupId(groupId); } - public static void removeByC_S(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { - getPersistence().removeByC_S(companyId, structureId); + public static void removeByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { + getPersistence().removeByC_G_S(companyId, groupId, structureId); } public static int countByGroupId(java.lang.String groupId) @@ -270,9 +278,10 @@ return getPersistence().countByGroupId(groupId); } - public static int countByC_S(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { - return getPersistence().countByC_S(companyId, structureId); + public static int countByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { + return getPersistence().countByC_G_S(companyId, groupId, structureId); } public static void initDao() { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalTemplatePersistence.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalTemplatePersistence.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalTemplatePersistence.java (working copy) @@ -364,7 +364,7 @@ } } - public List findByC_S(String companyId, String structureId) + public List findByC_G_S(String companyId, String groupId, String structureId) throws SystemException { Session session = null; @@ -384,6 +384,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -404,6 +413,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } @@ -418,13 +431,14 @@ } } - public List findByC_S(String companyId, String structureId, int begin, - int end) throws SystemException { - return findByC_S(companyId, structureId, begin, end, null); + public List findByC_G_S(String companyId, String groupId, + String structureId, int begin, int end) throws SystemException { + return findByC_G_S(companyId, groupId, structureId, begin, end, null); } - public List findByC_S(String companyId, String structureId, int begin, - int end, OrderByComparator obc) throws SystemException { + public List findByC_G_S(String companyId, String groupId, + String structureId, int begin, int end, OrderByComparator obc) + throws SystemException { Session session = null; try { @@ -443,6 +457,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -469,6 +492,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } @@ -483,10 +510,10 @@ } } - public JournalTemplate findByC_S_First(String companyId, + public JournalTemplate findByC_G_S_First(String companyId, String groupId, String structureId, OrderByComparator obc) throws NoSuchTemplateException, SystemException { - List list = findByC_S(companyId, structureId, 0, 1, obc); + List list = findByC_G_S(companyId, groupId, structureId, 0, 1, obc); if (list.size() == 0) { String msg = "No JournalTemplate exists with the key "; @@ -494,6 +521,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "structureId="; msg += structureId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -504,10 +534,12 @@ } } - public JournalTemplate findByC_S_Last(String companyId, String structureId, - OrderByComparator obc) throws NoSuchTemplateException, SystemException { - int count = countByC_S(companyId, structureId); - List list = findByC_S(companyId, structureId, count - 1, count, obc); + public JournalTemplate findByC_G_S_Last(String companyId, String groupId, + String structureId, OrderByComparator obc) + throws NoSuchTemplateException, SystemException { + int count = countByC_G_S(companyId, groupId, structureId); + List list = findByC_G_S(companyId, groupId, structureId, count - 1, + count, obc); if (list.size() == 0) { String msg = "No JournalTemplate exists with the key "; @@ -515,6 +547,9 @@ msg += "companyId="; msg += companyId; msg += ", "; + msg += "groupId="; + msg += groupId; + msg += ", "; msg += "structureId="; msg += structureId; msg += StringPool.CLOSE_CURLY_BRACE; @@ -525,12 +560,12 @@ } } - public JournalTemplate[] findByC_S_PrevAndNext( - JournalTemplatePK journalTemplatePK, String companyId, + public JournalTemplate[] findByC_G_S_PrevAndNext( + JournalTemplatePK journalTemplatePK, String companyId, String groupId, String structureId, OrderByComparator obc) throws NoSuchTemplateException, SystemException { JournalTemplate journalTemplate = findByPrimaryKey(journalTemplatePK); - int count = countByC_S(companyId, structureId); + int count = countByC_G_S(companyId, groupId, structureId); Session session = null; try { @@ -549,6 +584,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -575,6 +619,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } @@ -645,9 +693,9 @@ } } - public void removeByC_S(String companyId, String structureId) - throws SystemException { - Iterator itr = findByC_S(companyId, structureId).iterator(); + public void removeByC_G_S(String companyId, String groupId, + String structureId) throws SystemException { + Iterator itr = findByC_G_S(companyId, groupId, structureId).iterator(); while (itr.hasNext()) { JournalTemplate journalTemplate = (JournalTemplate)itr.next(); @@ -704,7 +752,7 @@ } } - public int countByC_S(String companyId, String structureId) + public int countByC_G_S(String companyId, String groupId, String structureId) throws SystemException { Session session = null; @@ -725,6 +773,15 @@ query.append(" AND "); + if (groupId == null) { + query.append("groupId IS NULL"); + } + else { + query.append("groupId = ?"); + } + + query.append(" AND "); + if (structureId == null) { query.append("structureId IS NULL"); } @@ -743,6 +800,10 @@ q.setString(queryPos++, companyId); } + if (groupId != null) { + q.setString(queryPos++, groupId); + } + if (structureId != null) { q.setString(queryPos++, structureId); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalArticleUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalArticleUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/persistence/JournalArticleUtil.java (working copy) @@ -236,186 +236,213 @@ groupId, obc); } - public static java.util.List findByC_A(java.lang.String companyId, - java.lang.String articleId) throws com.liferay.portal.SystemException { - return getPersistence().findByC_A(companyId, articleId); + public static java.util.List findByC_G_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId) + throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_A(companyId, groupId, articleId); } - public static java.util.List findByC_A(java.lang.String companyId, - java.lang.String articleId, int begin, int end) + public static java.util.List findByC_G_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId, int begin, int end) throws com.liferay.portal.SystemException { - return getPersistence().findByC_A(companyId, articleId, begin, end); + return getPersistence().findByC_G_A(companyId, groupId, articleId, + begin, end); } - public static java.util.List findByC_A(java.lang.String companyId, - java.lang.String articleId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + public static java.util.List findByC_G_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { - return getPersistence().findByC_A(companyId, articleId, begin, end, obc); + return getPersistence().findByC_G_A(companyId, groupId, articleId, + begin, end, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_A_First( - java.lang.String companyId, java.lang.String articleId, + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_A_First( + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_A_First(companyId, articleId, obc); + return getPersistence().findByC_G_A_First(companyId, groupId, + articleId, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_A_Last( - java.lang.String companyId, java.lang.String articleId, + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_A_Last( + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_A_Last(companyId, articleId, obc); + return getPersistence().findByC_G_A_Last(companyId, groupId, articleId, + obc); } - public static com.liferay.portlet.journal.model.JournalArticle[] findByC_A_PrevAndNext( + public static com.liferay.portlet.journal.model.JournalArticle[] findByC_G_A_PrevAndNext( com.liferay.portlet.journal.service.persistence.JournalArticlePK journalArticlePK, - java.lang.String companyId, java.lang.String articleId, + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_A_PrevAndNext(journalArticlePK, - companyId, articleId, obc); + return getPersistence().findByC_G_A_PrevAndNext(journalArticlePK, + companyId, groupId, articleId, obc); } - public static java.util.List findByC_S(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { - return getPersistence().findByC_S(companyId, structureId); + public static java.util.List findByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_S(companyId, groupId, structureId); } - public static java.util.List findByC_S(java.lang.String companyId, - java.lang.String structureId, int begin, int end) - throws com.liferay.portal.SystemException { - return getPersistence().findByC_S(companyId, structureId, begin, end); + public static java.util.List findByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId, int begin, + int end) throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_S(companyId, groupId, structureId, + begin, end); } - public static java.util.List findByC_S(java.lang.String companyId, - java.lang.String structureId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + public static java.util.List findByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { - return getPersistence().findByC_S(companyId, structureId, begin, end, - obc); + return getPersistence().findByC_G_S(companyId, groupId, structureId, + begin, end, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_S_First( - java.lang.String companyId, java.lang.String structureId, + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_S_First( + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_S_First(companyId, structureId, obc); + return getPersistence().findByC_G_S_First(companyId, groupId, + structureId, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_S_Last( - java.lang.String companyId, java.lang.String structureId, + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_S_Last( + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_S_Last(companyId, structureId, obc); + return getPersistence().findByC_G_S_Last(companyId, groupId, + structureId, obc); } - public static com.liferay.portlet.journal.model.JournalArticle[] findByC_S_PrevAndNext( + public static com.liferay.portlet.journal.model.JournalArticle[] findByC_G_S_PrevAndNext( com.liferay.portlet.journal.service.persistence.JournalArticlePK journalArticlePK, - java.lang.String companyId, java.lang.String structureId, + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_S_PrevAndNext(journalArticlePK, - companyId, structureId, obc); + return getPersistence().findByC_G_S_PrevAndNext(journalArticlePK, + companyId, groupId, structureId, obc); } - public static java.util.List findByC_T(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException { - return getPersistence().findByC_T(companyId, templateId); + public static java.util.List findByC_G_T(java.lang.String companyId, + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_T(companyId, groupId, templateId); } - public static java.util.List findByC_T(java.lang.String companyId, - java.lang.String templateId, int begin, int end) - throws com.liferay.portal.SystemException { - return getPersistence().findByC_T(companyId, templateId, begin, end); + public static java.util.List findByC_G_T(java.lang.String companyId, + java.lang.String groupId, java.lang.String templateId, int begin, + int end) throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_T(companyId, groupId, templateId, + begin, end); } - public static java.util.List findByC_T(java.lang.String companyId, - java.lang.String templateId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + public static java.util.List findByC_G_T(java.lang.String companyId, + java.lang.String groupId, java.lang.String templateId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { - return getPersistence().findByC_T(companyId, templateId, begin, end, obc); + return getPersistence().findByC_G_T(companyId, groupId, templateId, + begin, end, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_T_First( - java.lang.String companyId, java.lang.String templateId, + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_T_First( + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_T_First(companyId, templateId, obc); + return getPersistence().findByC_G_T_First(companyId, groupId, + templateId, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_T_Last( - java.lang.String companyId, java.lang.String templateId, + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_T_Last( + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_T_Last(companyId, templateId, obc); + return getPersistence().findByC_G_T_Last(companyId, groupId, + templateId, obc); } - public static com.liferay.portlet.journal.model.JournalArticle[] findByC_T_PrevAndNext( + public static com.liferay.portlet.journal.model.JournalArticle[] findByC_G_T_PrevAndNext( com.liferay.portlet.journal.service.persistence.JournalArticlePK journalArticlePK, - java.lang.String companyId, java.lang.String templateId, + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_T_PrevAndNext(journalArticlePK, - companyId, templateId, obc); + return getPersistence().findByC_G_T_PrevAndNext(journalArticlePK, + companyId, groupId, templateId, obc); } - public static java.util.List findByC_A_A(java.lang.String companyId, - java.lang.String articleId, boolean approved) + public static java.util.List findByC_G_A_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId, boolean approved) throws com.liferay.portal.SystemException { - return getPersistence().findByC_A_A(companyId, articleId, approved); + return getPersistence().findByC_G_A_A(companyId, groupId, articleId, + approved); } - public static java.util.List findByC_A_A(java.lang.String companyId, - java.lang.String articleId, boolean approved, int begin, int end) - throws com.liferay.portal.SystemException { - return getPersistence().findByC_A_A(companyId, articleId, approved, - begin, end); + public static java.util.List findByC_G_A_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId, boolean approved, + int begin, int end) throws com.liferay.portal.SystemException { + return getPersistence().findByC_G_A_A(companyId, groupId, articleId, + approved, begin, end); } - public static java.util.List findByC_A_A(java.lang.String companyId, - java.lang.String articleId, boolean approved, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + public static java.util.List findByC_G_A_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId, boolean approved, + int begin, int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { - return getPersistence().findByC_A_A(companyId, articleId, approved, - begin, end, obc); + return getPersistence().findByC_G_A_A(companyId, groupId, articleId, + approved, begin, end, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_A_A_First( - java.lang.String companyId, java.lang.String articleId, - boolean approved, com.liferay.portal.kernel.util.OrderByComparator obc) + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_A_A_First( + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, boolean approved, + com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_A_A_First(companyId, articleId, - approved, obc); + return getPersistence().findByC_G_A_A_First(companyId, groupId, + articleId, approved, obc); } - public static com.liferay.portlet.journal.model.JournalArticle findByC_A_A_Last( - java.lang.String companyId, java.lang.String articleId, - boolean approved, com.liferay.portal.kernel.util.OrderByComparator obc) + public static com.liferay.portlet.journal.model.JournalArticle findByC_G_A_A_Last( + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, boolean approved, + com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_A_A_Last(companyId, articleId, - approved, obc); + return getPersistence().findByC_G_A_A_Last(companyId, groupId, + articleId, approved, obc); } - public static com.liferay.portlet.journal.model.JournalArticle[] findByC_A_A_PrevAndNext( + public static com.liferay.portlet.journal.model.JournalArticle[] findByC_G_A_A_PrevAndNext( com.liferay.portlet.journal.service.persistence.JournalArticlePK journalArticlePK, - java.lang.String companyId, java.lang.String articleId, - boolean approved, com.liferay.portal.kernel.util.OrderByComparator obc) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, boolean approved, + com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException, com.liferay.portlet.journal.NoSuchArticleException { - return getPersistence().findByC_A_A_PrevAndNext(journalArticlePK, - companyId, articleId, approved, obc); + return getPersistence().findByC_G_A_A_PrevAndNext(journalArticlePK, + companyId, groupId, articleId, approved, obc); } public static java.util.List findAll() @@ -444,25 +471,28 @@ getPersistence().removeByGroupId(groupId); } - public static void removeByC_A(java.lang.String companyId, - java.lang.String articleId) throws com.liferay.portal.SystemException { - getPersistence().removeByC_A(companyId, articleId); + public static void removeByC_G_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId) + throws com.liferay.portal.SystemException { + getPersistence().removeByC_G_A(companyId, groupId, articleId); } - public static void removeByC_S(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { - getPersistence().removeByC_S(companyId, structureId); + public static void removeByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { + getPersistence().removeByC_G_S(companyId, groupId, structureId); } - public static void removeByC_T(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException { - getPersistence().removeByC_T(companyId, templateId); + public static void removeByC_G_T(java.lang.String companyId, + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException { + getPersistence().removeByC_G_T(companyId, groupId, templateId); } - public static void removeByC_A_A(java.lang.String companyId, - java.lang.String articleId, boolean approved) + public static void removeByC_G_A_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId, boolean approved) throws com.liferay.portal.SystemException { - getPersistence().removeByC_A_A(companyId, articleId, approved); + getPersistence().removeByC_G_A_A(companyId, groupId, articleId, approved); } public static int countByCompanyId(java.lang.String companyId) @@ -475,25 +505,29 @@ return getPersistence().countByGroupId(groupId); } - public static int countByC_A(java.lang.String companyId, - java.lang.String articleId) throws com.liferay.portal.SystemException { - return getPersistence().countByC_A(companyId, articleId); + public static int countByC_G_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId) + throws com.liferay.portal.SystemException { + return getPersistence().countByC_G_A(companyId, groupId, articleId); } - public static int countByC_S(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { - return getPersistence().countByC_S(companyId, structureId); + public static int countByC_G_S(java.lang.String companyId, + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { + return getPersistence().countByC_G_S(companyId, groupId, structureId); } - public static int countByC_T(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException { - return getPersistence().countByC_T(companyId, templateId); + public static int countByC_G_T(java.lang.String companyId, + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException { + return getPersistence().countByC_G_T(companyId, groupId, templateId); } - public static int countByC_A_A(java.lang.String companyId, - java.lang.String articleId, boolean approved) + public static int countByC_G_A_A(java.lang.String companyId, + java.lang.String groupId, java.lang.String articleId, boolean approved) throws com.liferay.portal.SystemException { - return getPersistence().countByC_A_A(companyId, articleId, approved); + return getPersistence().countByC_G_A_A(companyId, groupId, articleId, + approved); } public static void initDao() { Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalTemplatePermission.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalTemplatePermission.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalTemplatePermission.java (working copy) @@ -39,10 +39,10 @@ public static void check( PermissionChecker permissionChecker, String companyId, - String templateId, String actionId) + String groupId, String templateId, String actionId) throws PortalException, SystemException { - if (!contains(permissionChecker, companyId, templateId, actionId)) { + if (!contains(permissionChecker, companyId, groupId, templateId, actionId)) { throw new PrincipalException(); } } @@ -59,11 +59,11 @@ public static boolean contains( PermissionChecker permissionChecker, String companyId, - String templateId, String actionId) + String groupId, String templateId, String actionId) throws PortalException, SystemException { JournalTemplate template = - JournalTemplateLocalServiceUtil.getTemplate(companyId, templateId); + JournalTemplateLocalServiceUtil.getTemplate(companyId, groupId, templateId); return contains(permissionChecker, template, actionId); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalStructurePermission.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalStructurePermission.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalStructurePermission.java (working copy) @@ -39,10 +39,10 @@ public static void check( PermissionChecker permissionChecker, String companyId, - String structureId, String actionId) + String groupId, String structureId, String actionId) throws PortalException, SystemException { - if (!contains(permissionChecker, companyId, structureId, actionId)) { + if (!contains(permissionChecker, companyId, groupId, structureId, actionId)) { throw new PrincipalException(); } } @@ -59,12 +59,12 @@ public static boolean contains( PermissionChecker permissionChecker, String companyId, - String structureId, String actionId) + String groupId, String structureId, String actionId) throws PortalException, SystemException { JournalStructure structure = JournalStructureLocalServiceUtil.getStructure( - companyId, structureId); + companyId, groupId, structureId); return contains(permissionChecker, structure, actionId); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalArticlePermission.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalArticlePermission.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/service/permission/JournalArticlePermission.java (working copy) @@ -39,10 +39,10 @@ public static void check( PermissionChecker permissionChecker, String companyId, - String articleId, String actionId) + String groupId, String articleId, String actionId) throws PortalException, SystemException { - if (!contains(permissionChecker, companyId, articleId, actionId)) { + if (!contains(permissionChecker, companyId, groupId, articleId, actionId)) { throw new PrincipalException(); } } @@ -59,11 +59,11 @@ public static boolean contains( PermissionChecker permissionChecker, String companyId, - String articleId, String actionId) + String groupId, String articleId, String actionId) throws PortalException, SystemException { JournalArticle article = - JournalArticleLocalServiceUtil.getArticle(companyId, articleId); + JournalArticleLocalServiceUtil.getArticle(companyId, groupId, articleId); return contains(permissionChecker, article, actionId); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditTemplateAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditTemplateAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditTemplateAction.java (working copy) @@ -151,13 +151,14 @@ protected void deleteTemplates(ActionRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String[] deleteTemplateIds = StringUtil.split( ParamUtil.getString(req, "deleteTemplateIds")); for (int i = 0; i < deleteTemplateIds.length; i++) { JournalTemplateServiceUtil.deleteTemplate( - companyId, deleteTemplateIds[i]); + companyId, groupId, deleteTemplateIds[i]); JournalUtil.removeRecentTemplate(req, deleteTemplateIds[i]); } @@ -171,6 +172,8 @@ Layout layout = (Layout)uploadReq.getAttribute(WebKeys.LAYOUT); + String groupId = PortalUtil.getPortletGroupId(req); + String templateId = ParamUtil.getString(uploadReq, "templateId"); boolean autoTemplateId = ParamUtil.getBoolean( uploadReq, "autoTemplateId"); @@ -217,7 +220,7 @@ // Update template template = JournalTemplateServiceUtil.updateTemplate( - templateId, structureId, name, description, xsl, formatXsl, + groupId, templateId, structureId, name, description, xsl, formatXsl, langType, smallImage, smallImageURL, smallFile); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ExportAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ExportAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ExportAction.java (working copy) @@ -255,7 +255,7 @@ if (article.isApproved() && JournalArticleLocalServiceUtil.isLatestVersion( - article.getCompanyId(), article.getArticleId(), + article.getCompanyId(), article.getGroupId(), article.getArticleId(), article.getVersion())) { sb.append("insert into JournalArticle ("); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditStructureAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditStructureAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditStructureAction.java (working copy) @@ -144,13 +144,14 @@ protected void deleteStructures(ActionRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String[] deleteStructureIds = StringUtil.split( ParamUtil.getString(req, "deleteStructureIds")); for (int i = 0; i < deleteStructureIds.length; i++) { JournalStructureServiceUtil.deleteStructure( - companyId, deleteStructureIds[i]); + companyId, groupId, deleteStructureIds[i]); JournalUtil.removeRecentStructure(req, deleteStructureIds[i]); } @@ -164,6 +165,8 @@ String structureId = ParamUtil.getString(req, "structureId"); boolean autoStructureId = ParamUtil.getBoolean(req, "autoStructureId"); + String groupId = PortalUtil.getPortletGroupId(req); + String name = ParamUtil.getString(req, "name"); String description = ParamUtil.getString(req, "description"); String xsd = ParamUtil.getString(req, "xsd"); @@ -188,7 +191,7 @@ // Update structure structure = JournalStructureServiceUtil.updateStructure( - structureId, name, description, xsd); + groupId, structureId, name, description, xsd); } // Recent structures Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditArticleAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditArticleAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/EditArticleAction.java (working copy) @@ -25,6 +25,7 @@ import com.liferay.portal.model.Layout; import com.liferay.portal.model.impl.LayoutImpl; import com.liferay.portal.security.auth.PrincipalException; +import com.liferay.portal.service.persistence.LayoutUtil; import com.liferay.portal.struts.PortletAction; import com.liferay.portal.theme.ThemeDisplay; import com.liferay.portal.util.Constants; @@ -173,18 +174,20 @@ protected void approveArticle(ActionRequest req) throws Exception { Layout layout = (Layout)req.getAttribute(WebKeys.LAYOUT); + String groupId = PortalUtil.getPortletGroupId(req); String articleId = ParamUtil.getString(req, "articleId"); double version = ParamUtil.getDouble(req, "version"); String articleURL = ParamUtil.getString(req, "articleURL"); JournalArticleServiceUtil.approveArticle( - articleId, version, layout.getPlid(), articleURL, + groupId, articleId, version, layout.getPlid(), articleURL, req.getPreferences()); } protected void deleteArticles(ActionRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String[] deleteArticleIds = StringUtil.split( ParamUtil.getString(req, "deleteArticleIds")); @@ -198,7 +201,7 @@ pos + VERSION_SEPARATOR.length())); JournalArticleServiceUtil.deleteArticle( - companyId, articleId, version, null, null); + companyId, groupId, articleId, version, null, null); JournalUtil.removeRecentArticle(req, deleteArticleIds[i]); } @@ -206,6 +209,7 @@ protected void expireArticles(ActionRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String[] expireArticleIds = StringUtil.split( ParamUtil.getString(req, "expireArticleIds")); @@ -219,7 +223,7 @@ pos + VERSION_SEPARATOR.length())); JournalArticleServiceUtil.expireArticle( - companyId, articleId, version, null, null); + companyId, groupId, articleId, version, null, null); } } @@ -250,6 +254,7 @@ protected void removeArticlesLocale(ActionRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String[] removeArticleLocaleIds = StringUtil.split( ParamUtil.getString(req, "deleteArticleIds")); @@ -264,7 +269,7 @@ String languageId = ParamUtil.getString(req, "languageId"); JournalArticleServiceUtil.removeArticleLocale( - companyId, articleId, version, languageId); + companyId, groupId, articleId, version, languageId); } } @@ -282,6 +287,9 @@ if (Validator.isNotNull(groupId)) { plid = LayoutImpl.PUBLIC + groupId + ".1"; } + else { + groupId = PortalUtil.getPortletGroupId(req); + } String articleId = ParamUtil.getString(req, "articleId"); boolean autoArticleId = ParamUtil.getBoolean(req, "autoArticleId"); @@ -371,12 +379,12 @@ if (Validator.isNotNull(structureId)) { JournalArticle curArticle = JournalArticleServiceUtil.getArticle( - companyId, articleId, version); + companyId, groupId, articleId, version); if (Validator.isNotNull(curArticle.getStructureId())) { JournalStructure structure = JournalStructureServiceUtil.getStructure( - companyId, structureId); + companyId, groupId, structureId); content = JournalUtil.mergeLocaleContent( curArticle.getContent(), content, structure.getXsd()); @@ -386,7 +394,7 @@ // Update article article = JournalArticleServiceUtil.updateArticle( - companyId, articleId, version, incrementVersion, title, + companyId, groupId, articleId, version, incrementVersion, title, description, content, type, structureId, templateId, displayDateMonth, displayDateDay, displayDateYear, displayDateHour, displayDateMinute, expirationDateMonth, @@ -398,7 +406,7 @@ if (approve) { article = JournalArticleServiceUtil.approveArticle( - article.getArticleId(), article.getVersion(), layout.getPlid(), + article.getGroupId(), article.getArticleId(), article.getVersion(), layout.getPlid(), articleURL, req.getPreferences()); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ViewArticleContentAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ViewArticleContentAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ViewArticleContentAction.java (working copy) @@ -82,6 +82,7 @@ (ThemeDisplay)req.getAttribute(WebKeys.THEME_DISPLAY); String companyId = themeDisplay.getCompanyId(); + String groupId = PortalUtil.getPortletGroupId(req); String articleId = ParamUtil.getString(req, "articleId"); double version = ParamUtil.getDouble( req, "version", JournalArticleImpl.DEFAULT_VERSION); @@ -173,7 +174,7 @@ JournalTemplate template = JournalTemplateLocalServiceUtil.getTemplate( - companyId, templateId); + companyId, groupId, templateId); String langType = template.getLangType(); String script = template.getXsl(); @@ -183,7 +184,7 @@ } else { output = JournalArticleServiceUtil.getArticleContent( - companyId, articleId, version, languageId, themeDisplay); + companyId, groupId, articleId, version, languageId, themeDisplay); } req.setAttribute(WebKeys.JOURNAL_ARTICLE_CONTENT, output); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetLatestArticleContentAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetLatestArticleContentAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetLatestArticleContentAction.java (working copy) @@ -56,13 +56,14 @@ try { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String articleId = ParamUtil.getString(req, "articleId"); String languageId = LanguageUtil.getLanguageId(req); JournalArticle article = JournalArticleLocalServiceUtil.getLatestArticle( - companyId, articleId, Boolean.TRUE); + companyId, groupId, articleId, Boolean.TRUE); String fileName = "content.xml"; byte[] byteArray = Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetTemplateAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetTemplateAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetTemplateAction.java (working copy) @@ -62,6 +62,7 @@ try { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String templateId = getTemplateId(req); ThemeDisplay themeDisplay = @@ -77,7 +78,7 @@ JournalTemplate template = JournalTemplateLocalServiceUtil.getTemplate( - companyId, templateId); + companyId, groupId, templateId); String script = JournalUtil.getTemplateScript( template, tokens, languageId, transform); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ActionUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ActionUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/ActionUtil.java (working copy) @@ -76,6 +76,7 @@ public static void getArticle(HttpServletRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String articleId = ParamUtil.getString(req, "articleId"); double version = ParamUtil.getDouble( req, "version", JournalArticleImpl.DEFAULT_VERSION); @@ -84,7 +85,7 @@ if (Validator.isNotNull(articleId)) { article = JournalArticleServiceUtil.getArticle( - companyId, articleId, version); + companyId, groupId, articleId, version); } req.setAttribute(WebKeys.JOURNAL_ARTICLE, article); @@ -116,13 +117,14 @@ public static void getStructure(HttpServletRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String structureId = ParamUtil.getString(req, "structureId"); JournalStructure structure = null; if (Validator.isNotNull(structureId)) { structure = JournalStructureServiceUtil.getStructure( - companyId, structureId); + companyId, groupId, structureId); } req.setAttribute(WebKeys.JOURNAL_STRUCTURE, structure); @@ -154,13 +156,14 @@ public static void getTemplate(HttpServletRequest req) throws Exception { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String templateId = ParamUtil.getString(req, "templateId"); JournalTemplate template = null; if (Validator.isNotNull(templateId)) { template = JournalTemplateServiceUtil.getTemplate( - companyId, templateId); + companyId, groupId, templateId); } req.setAttribute(WebKeys.JOURNAL_TEMPLATE, template); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetStructureAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetStructureAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/action/GetStructureAction.java (working copy) @@ -53,11 +53,12 @@ try { String companyId = PortalUtil.getCompanyId(req); + String groupId = PortalUtil.getPortletGroupId(req); String structureId = ParamUtil.getString(req, "structureId"); JournalStructure structure = JournalStructureLocalServiceUtil.getStructure( - companyId, structureId); + companyId, groupId, structureId); String fileName = structure.getStructureId() + ".xml"; byte[] byteArray = structure.getXsd().getBytes(); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/URIResolver.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/URIResolver.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/URIResolver.java (working copy) @@ -58,11 +58,12 @@ templatePathIndex + _GET_TEMPLATE_PATH.length(); String companyId = (String)_tokens.get("company_id"); + String groupId = (String)_tokens.get("group_id"); String templateId = href.substring(templateIdIndex, href.length()); content = JournalUtil.getTemplateScript( - companyId, templateId, _tokens, _languageId); + companyId, groupId, templateId, _tokens, _languageId); } else { content = Http.URLtoString(href); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/ContentTransformerListener.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/ContentTransformerListener.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/ContentTransformerListener.java (working copy) @@ -106,6 +106,7 @@ Map tokens = getTokens(); String companyId = (String)tokens.get("company_id"); + String groupId = (String)tokens.get("group_id"); Iterator itr = root.elements().iterator(); @@ -137,7 +138,7 @@ JournalArticle article = JournalArticleLocalServiceUtil.getArticle( - companyId, articleId); + companyId, groupId, articleId); dynamicContent.setText(StringPool.BLANK); dynamicContent.addCDATA( Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/PropertiesTransformerListener.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/PropertiesTransformerListener.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/PropertiesTransformerListener.java (working copy) @@ -103,9 +103,10 @@ newTokens.put("template_id", _GLOBAL_PROPERTIES); String companyId = (String)tokens.get("company_id"); + String groupId = (String)tokens.get("group_id"); String script = JournalUtil.getTemplateScript( - companyId, _GLOBAL_PROPERTIES, newTokens, getLanguageId()); + companyId, groupId, _GLOBAL_PROPERTIES, newTokens, getLanguageId()); PropertiesUtil.load(props, script); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/JournalUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/JournalUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/JournalUtil.java (working copy) @@ -457,20 +457,20 @@ } public static String getTemplateScript( - String companyId, String templateId, Map tokens, String languageId) + String companyId, String groupId, String templateId, Map tokens, String languageId) throws PortalException, SystemException { return getTemplateScript( - companyId, templateId, tokens, languageId, true); + companyId, groupId, templateId, tokens, languageId, true); } public static String getTemplateScript( - String companyId, String templateId, Map tokens, String languageId, + String companyId, String groupId, String templateId, Map tokens, String languageId, boolean transform) throws PortalException, SystemException { JournalTemplate template = - JournalTemplateLocalServiceUtil.getTemplate(companyId, templateId); + JournalTemplateLocalServiceUtil.getTemplate(companyId, groupId, templateId); return getTemplateScript(template, tokens, languageId, transform); } @@ -524,6 +524,7 @@ Company company = themeDisplay.getCompany(); tokens.put("company_id", themeDisplay.getCompanyId()); + tokens.put("group_id", themeDisplay.getPortletGroupId()); tokens.put("cms_url", themeDisplay.getPathRoot() + "/cms/servlet"); tokens.put("image_path", themeDisplay.getPathImage()); tokens.put( Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/JournalVmUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/JournalVmUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journal/util/JournalVmUtil.java (working copy) @@ -80,11 +80,12 @@ } String companyId = (String)tokens.get("company_id"); + String groupId = (String)tokens.get("group_id"); context.put( "journalTemplatesPath", VelocityResourceListener.JOURNAL_SEPARATOR + StringPool.SLASH + - companyId); + companyId + StringPool.SLASH + groupId); load = Velocity.evaluate( context, output, JournalVmUtil.class.getName(), vmScript); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/action/ViewAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/action/ViewAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/action/ViewAction.java (working copy) @@ -25,6 +25,7 @@ import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.struts.PortletAction; import com.liferay.portal.theme.ThemeDisplay; +import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.WebKeys; import com.liferay.portlet.journalcontent.util.JournalContentUtil; @@ -65,7 +66,7 @@ for (int i = 0; i < articleIds.length; i++) { content[i] = JournalContentUtil.getContent( - companyId, articleIds[i], languageId, themeDisplay); + companyId, PortalUtil.getPortletGroupId(req), articleIds[i], languageId, themeDisplay); } req.setAttribute(WebKeys.JOURNAL_ARTICLE_CONTENT, content); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/action/EditConfigurationAction.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/action/EditConfigurationAction.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/action/EditConfigurationAction.java (working copy) @@ -27,6 +27,7 @@ import com.liferay.portal.struts.PortletAction; import com.liferay.portal.theme.ThemeDisplay; import com.liferay.portal.util.Constants; +import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.WebKeys; import com.liferay.portlet.PortletPreferencesFactory; import com.liferay.portlet.journal.NoSuchArticleException; @@ -91,7 +92,7 @@ req, name).toUpperCase(); String content = JournalContentUtil.getContent( - companyId, articleId, languageId, themeDisplay); + companyId, PortalUtil.getPortletGroupId(req), articleId, languageId, themeDisplay); if (Validator.isNull(content)) { throw new NoSuchArticleException(); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/util/JournalContentUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/util/JournalContentUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/src/com/liferay/portlet/journalcontent/util/JournalContentUtil.java (working copy) @@ -55,7 +55,7 @@ } public static String getContent( - String companyId, String articleId, String languageId, + String companyId, String groupId, String articleId, String languageId, ThemeDisplay themeDisplay) { String content = null; @@ -76,7 +76,7 @@ catch (NeedsRefreshException nre) { try { content = JournalArticleLocalServiceUtil.getArticleContent( - companyId, articleId, languageId, themeDisplay); + companyId, groupId, articleId, languageId, themeDisplay); } catch (Exception e) { _log.warn(e.getMessage()); Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/classes/META-INF/portal-model-hints.xml =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/classes/META-INF/portal-model-hints.xml (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/classes/META-INF/portal-model-hints.xml (working copy) @@ -606,11 +606,11 @@ + true - @@ -643,10 +643,10 @@ + true - @@ -661,10 +661,10 @@ + true - Index: C:/home/jkoz/java/liferay-svn/portal/portal-ejb/classes/META-INF/portal-hbm.xml =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-ejb/classes/META-INF/portal-hbm.xml (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-ejb/classes/META-INF/portal-hbm.xml (working copy) @@ -630,10 +630,10 @@

- @@ -667,9 +667,9 @@

- @@ -682,9 +682,9 @@

- Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalArticleModel.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalArticleModel.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalArticleModel.java (working copy) @@ -43,6 +43,10 @@ public void setCompanyId(String companyId); + public String getGroupId(); + + public void setGroupId(String groupId); + public String getArticleId(); public void setArticleId(String articleId); @@ -51,10 +55,6 @@ public void setVersion(double version); - public String getGroupId(); - - public void setGroupId(String groupId); - public String getUserId(); public void setUserId(String userId); Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalArticleSoap.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalArticleSoap.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalArticleSoap.java (working copy) @@ -40,9 +40,9 @@ public static JournalArticleSoap toSoapModel(JournalArticle model) { JournalArticleSoap soapModel = new JournalArticleSoap(); soapModel.setCompanyId(model.getCompanyId()); + soapModel.setGroupId(model.getGroupId()); soapModel.setArticleId(model.getArticleId()); soapModel.setVersion(model.getVersion()); - soapModel.setGroupId(model.getGroupId()); soapModel.setUserId(model.getUserId()); soapModel.setUserName(model.getUserName()); soapModel.setCreateDate(model.getCreateDate()); @@ -80,11 +80,12 @@ } public JournalArticlePK getPrimaryKey() { - return new JournalArticlePK(_companyId, _articleId, _version); + return new JournalArticlePK(_companyId, _groupId, _articleId, _version); } public void setPrimaryKey(JournalArticlePK pk) { setCompanyId(pk.companyId); + setGroupId(pk.groupId); setArticleId(pk.articleId); setVersion(pk.version); } @@ -97,6 +98,14 @@ _companyId = companyId; } + public String getGroupId() { + return _groupId; + } + + public void setGroupId(String groupId) { + _groupId = groupId; + } + public String getArticleId() { return _articleId; } @@ -113,14 +122,6 @@ _version = version; } - public String getGroupId() { - return _groupId; - } - - public void setGroupId(String groupId) { - _groupId = groupId; - } - public String getUserId() { return _userId; } @@ -274,9 +275,9 @@ } private String _companyId; + private String _groupId; private String _articleId; private double _version; - private String _groupId; private String _userId; private String _userName; private Date _createDate; Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalTemplateModel.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalTemplateModel.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalTemplateModel.java (working copy) @@ -43,14 +43,14 @@ public void setCompanyId(String companyId); + public String getGroupId(); + + public void setGroupId(String groupId); + public String getTemplateId(); public void setTemplateId(String templateId); - public String getGroupId(); - - public void setGroupId(String groupId); - public String getUserId(); public void setUserId(String userId); Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalTemplateSoap.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalTemplateSoap.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalTemplateSoap.java (working copy) @@ -40,8 +40,8 @@ public static JournalTemplateSoap toSoapModel(JournalTemplate model) { JournalTemplateSoap soapModel = new JournalTemplateSoap(); soapModel.setCompanyId(model.getCompanyId()); + soapModel.setGroupId(model.getGroupId()); soapModel.setTemplateId(model.getTemplateId()); - soapModel.setGroupId(model.getGroupId()); soapModel.setUserId(model.getUserId()); soapModel.setUserName(model.getUserName()); soapModel.setCreateDate(model.getCreateDate()); @@ -72,11 +72,12 @@ } public JournalTemplatePK getPrimaryKey() { - return new JournalTemplatePK(_companyId, _templateId); + return new JournalTemplatePK(_companyId, _groupId, _templateId); } public void setPrimaryKey(JournalTemplatePK pk) { setCompanyId(pk.companyId); + setGroupId(pk.groupId); setTemplateId(pk.templateId); } @@ -88,6 +89,14 @@ _companyId = companyId; } + public String getGroupId() { + return _groupId; + } + + public void setGroupId(String groupId) { + _groupId = groupId; + } + public String getTemplateId() { return _templateId; } @@ -96,14 +105,6 @@ _templateId = templateId; } - public String getGroupId() { - return _groupId; - } - - public void setGroupId(String groupId) { - _groupId = groupId; - } - public String getUserId() { return _userId; } @@ -197,8 +198,8 @@ } private String _companyId; + private String _groupId; private String _templateId; - private String _groupId; private String _userId; private String _userName; private Date _createDate; Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalStructureModel.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalStructureModel.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalStructureModel.java (working copy) @@ -43,14 +43,14 @@ public void setCompanyId(String companyId); + public String getGroupId(); + + public void setGroupId(String groupId); + public String getStructureId(); public void setStructureId(String structureId); - public String getGroupId(); - - public void setGroupId(String groupId); - public String getUserId(); public void setUserId(String userId); Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalStructureSoap.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalStructureSoap.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/model/JournalStructureSoap.java (working copy) @@ -40,8 +40,8 @@ public static JournalStructureSoap toSoapModel(JournalStructure model) { JournalStructureSoap soapModel = new JournalStructureSoap(); soapModel.setCompanyId(model.getCompanyId()); + soapModel.setGroupId(model.getGroupId()); soapModel.setStructureId(model.getStructureId()); - soapModel.setGroupId(model.getGroupId()); soapModel.setUserId(model.getUserId()); soapModel.setUserName(model.getUserName()); soapModel.setCreateDate(model.getCreateDate()); @@ -68,11 +68,12 @@ } public JournalStructurePK getPrimaryKey() { - return new JournalStructurePK(_companyId, _structureId); + return new JournalStructurePK(_companyId, _groupId, _structureId); } public void setPrimaryKey(JournalStructurePK pk) { setCompanyId(pk.companyId); + setGroupId(pk.groupId); setStructureId(pk.structureId); } @@ -84,6 +85,14 @@ _companyId = companyId; } + public String getGroupId() { + return _groupId; + } + + public void setGroupId(String groupId) { + _groupId = groupId; + } + public String getStructureId() { return _structureId; } @@ -92,14 +101,6 @@ _structureId = structureId; } - public String getGroupId() { - return _groupId; - } - - public void setGroupId(String groupId) { - _groupId = groupId; - } - public String getUserId() { return _userId; } @@ -157,8 +158,8 @@ } private String _companyId; + private String _groupId; private String _structureId; - private String _groupId; private String _userId; private String _userName; private Date _createDate; Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleService.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleService.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleService.java (working copy) @@ -65,37 +65,40 @@ com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalArticle approveArticle( - java.lang.String articleId, double version, java.lang.String plid, - java.lang.String articleURL, javax.portlet.PortletPreferences prefs) + java.lang.String groupId, java.lang.String articleId, double version, + java.lang.String plid, java.lang.String articleURL, + javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId, double version) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, java.lang.String languageId, + java.lang.String groupId, java.lang.String articleId, + java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public void deleteArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public void expireArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; @@ -106,24 +109,24 @@ com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalArticle removeArticleLocale( - java.lang.String companyId, java.lang.String articleId, double version, - java.lang.String languageId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalArticle updateArticle( - java.lang.String companyId, java.lang.String articleId, double version, - boolean incrementVersion, java.lang.String title, - java.lang.String description, java.lang.String content, - java.lang.String type, java.lang.String structureId, - java.lang.String templateId, int displayDateMonth, int displayDateDay, - int displayDateYear, int displayDateHour, int displayDateMinute, - int expirationDateMonth, int expirationDateDay, int expirationDateYear, - int expirationDateHour, int expirationDateMinute, boolean neverExpire, - int reviewDateMonth, int reviewDateDay, int reviewDateYear, - int reviewDateHour, int reviewDateMinute, boolean neverReview, - java.util.Map images, java.lang.String articleURL, - javax.portlet.PortletPreferences prefs) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, boolean incrementVersion, + java.lang.String title, java.lang.String description, + java.lang.String content, java.lang.String type, + java.lang.String structureId, java.lang.String templateId, + int displayDateMonth, int displayDateDay, int displayDateYear, + int displayDateHour, int displayDateMinute, int expirationDateMonth, + int expirationDateDay, int expirationDateYear, int expirationDateHour, + int expirationDateMinute, boolean neverExpire, int reviewDateMonth, + int reviewDateDay, int reviewDateYear, int reviewDateHour, + int reviewDateMinute, boolean neverReview, java.util.Map images, + java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateLocalServiceUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateLocalServiceUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateLocalServiceUtil.java (working copy) @@ -88,14 +88,36 @@ guestPermissions); } + public static com.liferay.portlet.journal.model.JournalTemplate addTemplate( + java.lang.String userId, java.lang.String groupId, + java.lang.String templateId, boolean autoTemplateId, + java.lang.String plid, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsl, boolean formatXsl, java.lang.String langType, + boolean smallImage, java.lang.String smallImageURL, + java.io.File smallFile, java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.PortalException, + com.liferay.portal.SystemException { + JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); + + return journalTemplateLocalService.addTemplate(userId, groupId, + templateId, autoTemplateId, plid, structureId, name, description, + xsl, formatXsl, langType, smallImage, smallImageURL, smallFile, + addCommunityPermissions, addGuestPermissions, communityPermissions, + guestPermissions); + } + public static void addTemplateResources(java.lang.String companyId, - java.lang.String templateId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String templateId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); - journalTemplateLocalService.addTemplateResources(companyId, templateId, - addCommunityPermissions, addGuestPermissions); + journalTemplateLocalService.addTemplateResources(companyId, groupId, + templateId, addCommunityPermissions, addGuestPermissions); } public static void addTemplateResources( @@ -109,13 +131,14 @@ } public static void addTemplateResources(java.lang.String companyId, - java.lang.String templateId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String templateId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); - journalTemplateLocalService.addTemplateResources(companyId, templateId, - communityPermissions, guestPermissions); + journalTemplateLocalService.addTemplateResources(companyId, groupId, + templateId, communityPermissions, guestPermissions); } public static void addTemplateResources( @@ -130,19 +153,20 @@ } public static void checkNewLine(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); - journalTemplateLocalService.checkNewLine(companyId, templateId); + journalTemplateLocalService.checkNewLine(companyId, groupId, templateId); } public static void deleteTemplate(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); - journalTemplateLocalService.deleteTemplate(companyId, templateId); + journalTemplateLocalService.deleteTemplate(companyId, groupId, + templateId); } public static void deleteTemplate( @@ -154,38 +178,42 @@ } public static java.util.List getStructureTemplates( - java.lang.String companyId, java.lang.String structureId) - throws com.liferay.portal.SystemException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); return journalTemplateLocalService.getStructureTemplates(companyId, - structureId); + groupId, structureId); } public static java.util.List getStructureTemplates( - java.lang.String companyId, java.lang.String structureId, int begin, - int end) throws com.liferay.portal.SystemException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, int begin, int end) + throws com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); return journalTemplateLocalService.getStructureTemplates(companyId, - structureId, begin, end); + groupId, structureId, begin, end); } public static int getStructureTemplatesCount(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); return journalTemplateLocalService.getStructureTemplatesCount(companyId, - structureId); + groupId, structureId); } public static com.liferay.portlet.journal.model.JournalTemplate getTemplate( - java.lang.String companyId, java.lang.String templateId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); - return journalTemplateLocalService.getTemplate(companyId, templateId); + return journalTemplateLocalService.getTemplate(companyId, groupId, + templateId); } public static java.util.List getTemplates(java.lang.String groupId) @@ -236,16 +264,17 @@ } public static com.liferay.portlet.journal.model.JournalTemplate updateTemplate( - java.lang.String companyId, java.lang.String templateId, - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsl, boolean formatXsl, - java.lang.String langType, boolean smallImage, - java.lang.String smallImageURL, java.io.File smallFile) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsl, boolean formatXsl, java.lang.String langType, + boolean smallImage, java.lang.String smallImageURL, + java.io.File smallFile) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalTemplateLocalService journalTemplateLocalService = JournalTemplateLocalServiceFactory.getService(); - return journalTemplateLocalService.updateTemplate(companyId, + return journalTemplateLocalService.updateTemplate(companyId, groupId, templateId, structureId, name, description, xsl, formatXsl, langType, smallImage, smallImageURL, smallFile); } Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateLocalService.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateLocalService.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateLocalService.java (working copy) @@ -66,9 +66,23 @@ throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; + public com.liferay.portlet.journal.model.JournalTemplate addTemplate( + java.lang.String userId, java.lang.String groupId, + java.lang.String templateId, boolean autoTemplateId, + java.lang.String plid, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsl, boolean formatXsl, java.lang.String langType, + boolean smallImage, java.lang.String smallImageURL, + java.io.File smallFile, java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.SystemException, + com.liferay.portal.PortalException; + public void addTemplateResources(java.lang.String companyId, - java.lang.String templateId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String templateId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -79,7 +93,8 @@ com.liferay.portal.PortalException; public void addTemplateResources(java.lang.String companyId, - java.lang.String templateId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String templateId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -92,12 +107,12 @@ com.liferay.portal.PortalException; public void checkNewLine(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public void deleteTemplate(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -107,17 +122,20 @@ com.liferay.portal.PortalException; public java.util.List getStructureTemplates(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException; + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException; public java.util.List getStructureTemplates(java.lang.String companyId, - java.lang.String structureId, int begin, int end) - throws com.liferay.portal.SystemException; + java.lang.String groupId, java.lang.String structureId, int begin, + int end) throws com.liferay.portal.SystemException; public int getStructureTemplatesCount(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException; + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException; public com.liferay.portlet.journal.model.JournalTemplate getTemplate( - java.lang.String companyId, java.lang.String templateId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -145,11 +163,12 @@ throws com.liferay.portal.SystemException; public com.liferay.portlet.journal.model.JournalTemplate updateTemplate( - java.lang.String companyId, java.lang.String templateId, - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsl, boolean formatXsl, - java.lang.String langType, boolean smallImage, - java.lang.String smallImageURL, java.io.File smallFile) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsl, boolean formatXsl, java.lang.String langType, + boolean smallImage, java.lang.String smallImageURL, + java.io.File smallFile) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalTemplatePK.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalTemplatePK.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalTemplatePK.java (working copy) @@ -34,13 +34,15 @@ */ public class JournalTemplatePK implements Comparable, Serializable { public String companyId; + public String groupId; public String templateId; public JournalTemplatePK() { } - public JournalTemplatePK(String companyId, String templateId) { + public JournalTemplatePK(String companyId, String groupId, String templateId) { this.companyId = companyId; + this.groupId = groupId; this.templateId = templateId; } @@ -52,6 +54,14 @@ this.companyId = companyId; } + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + public String getTemplateId() { return templateId; } @@ -73,6 +83,12 @@ return value; } + value = groupId.compareTo(pk.groupId); + + if (value != 0) { + return value; + } + value = templateId.compareTo(pk.templateId); if (value != 0) { @@ -96,7 +112,7 @@ return false; } - if ((companyId.equals(pk.companyId)) && + if ((companyId.equals(pk.companyId)) && (groupId.equals(pk.groupId)) && (templateId.equals(pk.templateId))) { return true; } @@ -106,7 +122,7 @@ } public int hashCode() { - return (companyId + templateId).hashCode(); + return (companyId + groupId + templateId).hashCode(); } public String toString() { @@ -117,6 +133,11 @@ sb.append(companyId); sb.append(StringPool.COMMA); sb.append(StringPool.SPACE); + sb.append("groupId"); + sb.append(StringPool.EQUAL); + sb.append(groupId); + sb.append(StringPool.COMMA); + sb.append(StringPool.SPACE); sb.append("templateId"); sb.append(StringPool.EQUAL); sb.append(templateId); Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalStructurePK.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalStructurePK.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalStructurePK.java (working copy) @@ -34,13 +34,16 @@ */ public class JournalStructurePK implements Comparable, Serializable { public String companyId; + public String groupId; public String structureId; public JournalStructurePK() { } - public JournalStructurePK(String companyId, String structureId) { + public JournalStructurePK(String companyId, String groupId, + String structureId) { this.companyId = companyId; + this.groupId = groupId; this.structureId = structureId; } @@ -52,6 +55,14 @@ this.companyId = companyId; } + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + public String getStructureId() { return structureId; } @@ -73,6 +84,12 @@ return value; } + value = groupId.compareTo(pk.groupId); + + if (value != 0) { + return value; + } + value = structureId.compareTo(pk.structureId); if (value != 0) { @@ -96,7 +113,7 @@ return false; } - if ((companyId.equals(pk.companyId)) && + if ((companyId.equals(pk.companyId)) && (groupId.equals(pk.groupId)) && (structureId.equals(pk.structureId))) { return true; } @@ -106,7 +123,7 @@ } public int hashCode() { - return (companyId + structureId).hashCode(); + return (companyId + groupId + structureId).hashCode(); } public String toString() { @@ -117,6 +134,11 @@ sb.append(companyId); sb.append(StringPool.COMMA); sb.append(StringPool.SPACE); + sb.append("groupId"); + sb.append(StringPool.EQUAL); + sb.append(groupId); + sb.append(StringPool.COMMA); + sb.append(StringPool.SPACE); sb.append("structureId"); sb.append(StringPool.EQUAL); sb.append(structureId); Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalArticlePK.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalArticlePK.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/persistence/JournalArticlePK.java (working copy) @@ -34,14 +34,17 @@ */ public class JournalArticlePK implements Comparable, Serializable { public String companyId; + public String groupId; public String articleId; public double version; public JournalArticlePK() { } - public JournalArticlePK(String companyId, String articleId, double version) { + public JournalArticlePK(String companyId, String groupId, String articleId, + double version) { this.companyId = companyId; + this.groupId = groupId; this.articleId = articleId; this.version = version; } @@ -54,6 +57,14 @@ this.companyId = companyId; } + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + public String getArticleId() { return articleId; } @@ -83,6 +94,12 @@ return value; } + value = groupId.compareTo(pk.groupId); + + if (value != 0) { + return value; + } + value = articleId.compareTo(pk.articleId); if (value != 0) { @@ -120,7 +137,7 @@ return false; } - if ((companyId.equals(pk.companyId)) && + if ((companyId.equals(pk.companyId)) && (groupId.equals(pk.groupId)) && (articleId.equals(pk.articleId)) && (version == pk.version)) { return true; } @@ -130,7 +147,7 @@ } public int hashCode() { - return (companyId + articleId + version).hashCode(); + return (companyId + groupId + articleId + version).hashCode(); } public String toString() { @@ -141,6 +158,11 @@ sb.append(companyId); sb.append(StringPool.COMMA); sb.append(StringPool.SPACE); + sb.append("groupId"); + sb.append(StringPool.EQUAL); + sb.append(groupId); + sb.append(StringPool.COMMA); + sb.append(StringPool.SPACE); sb.append("articleId"); sb.append(StringPool.EQUAL); sb.append(articleId); Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleLocalServiceUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleLocalServiceUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleLocalServiceUtil.java (working copy) @@ -121,14 +121,48 @@ guestPermissions); } + public static com.liferay.portlet.journal.model.JournalArticle addArticle( + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, boolean autoArticleId, + java.lang.String plid, java.lang.String title, + java.lang.String description, java.lang.String content, + java.lang.String type, java.lang.String structureId, + java.lang.String templateId, int displayDateMonth, int displayDateDay, + int displayDateYear, int displayDateHour, int displayDateMinute, + int expirationDateMonth, int expirationDateDay, int expirationDateYear, + int expirationDateHour, int expirationDateMinute, boolean neverExpire, + int reviewDateMonth, int reviewDateDay, int reviewDateYear, + int reviewDateHour, int reviewDateMinute, boolean neverReview, + java.util.Map images, java.lang.String articleURL, + javax.portlet.PortletPreferences prefs, + java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.PortalException, + com.liferay.portal.SystemException { + JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); + + return journalArticleLocalService.addArticle(userId, groupId, + articleId, autoArticleId, plid, title, description, content, type, + structureId, templateId, displayDateMonth, displayDateDay, + displayDateYear, displayDateHour, displayDateMinute, + expirationDateMonth, expirationDateDay, expirationDateYear, + expirationDateHour, expirationDateMinute, neverExpire, + reviewDateMonth, reviewDateDay, reviewDateYear, reviewDateHour, + reviewDateMinute, neverReview, images, articleURL, prefs, + addCommunityPermissions, addGuestPermissions, communityPermissions, + guestPermissions); + } + public static void addArticleResources(java.lang.String companyId, - java.lang.String articleId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String articleId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - journalArticleLocalService.addArticleResources(companyId, articleId, - addCommunityPermissions, addGuestPermissions); + journalArticleLocalService.addArticleResources(companyId, groupId, + articleId, addCommunityPermissions, addGuestPermissions); } public static void addArticleResources( @@ -142,13 +176,14 @@ } public static void addArticleResources(java.lang.String companyId, - java.lang.String articleId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String articleId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - journalArticleLocalService.addArticleResources(companyId, articleId, - communityPermissions, guestPermissions); + journalArticleLocalService.addArticleResources(companyId, groupId, + articleId, communityPermissions, guestPermissions); } public static void addArticleResources( @@ -163,14 +198,15 @@ } public static com.liferay.portlet.journal.model.JournalArticle approveArticle( - java.lang.String userId, java.lang.String articleId, double version, + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.approveArticle(userId, articleId, - version, articleURL, prefs); + return journalArticleLocalService.approveArticle(userId, groupId, + articleId, version, articleURL, prefs); } public static void checkArticles() @@ -181,21 +217,22 @@ } public static void checkNewLine(java.lang.String companyId, - java.lang.String articleId, double version) + java.lang.String groupId, java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - journalArticleLocalService.checkNewLine(companyId, articleId, version); + journalArticleLocalService.checkNewLine(companyId, groupId, articleId, + version); } public static void deleteArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - journalArticleLocalService.deleteArticle(companyId, articleId, version, - articleURL, prefs); + journalArticleLocalService.deleteArticle(companyId, groupId, articleId, + version, articleURL, prefs); } public static void deleteArticle( @@ -215,13 +252,13 @@ } public static void expireArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - journalArticleLocalService.expireArticle(companyId, articleId, version, - articleURL, prefs); + journalArticleLocalService.expireArticle(companyId, groupId, articleId, + version, articleURL, prefs); } public static void expireArticle( @@ -234,45 +271,49 @@ } public static com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getArticle(companyId, articleId); + return journalArticleLocalService.getArticle(companyId, groupId, + articleId); } public static com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId, double version) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getArticle(companyId, articleId, - version); + return journalArticleLocalService.getArticle(companyId, groupId, + articleId, version); } public static java.lang.String getArticleContent( - java.lang.String companyId, java.lang.String articleId, - java.lang.String languageId, + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getArticleContent(companyId, + return journalArticleLocalService.getArticleContent(companyId, groupId, articleId, languageId, themeDisplay); } public static java.lang.String getArticleContent( - java.lang.String companyId, java.lang.String articleId, double version, + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getArticleContent(companyId, + return journalArticleLocalService.getArticleContent(companyId, groupId, articleId, version, languageId, themeDisplay); } @@ -306,105 +347,114 @@ } public static com.liferay.portlet.journal.model.JournalArticle getDisplayArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getDisplayArticle(companyId, articleId); + return journalArticleLocalService.getDisplayArticle(companyId, groupId, + articleId); } public static com.liferay.portlet.journal.model.JournalArticle getLatestArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getLatestArticle(companyId, articleId); + return journalArticleLocalService.getLatestArticle(companyId, groupId, + articleId); } public static com.liferay.portlet.journal.model.JournalArticle getLatestArticle( - java.lang.String companyId, java.lang.String articleId, - java.lang.Boolean approved) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, java.lang.Boolean approved) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getLatestArticle(companyId, + return journalArticleLocalService.getLatestArticle(companyId, groupId, articleId, approved); } public static double getLatestVersion(java.lang.String companyId, - java.lang.String articleId) + java.lang.String groupId, java.lang.String articleId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.getLatestVersion(companyId, articleId); + return journalArticleLocalService.getLatestVersion(companyId, groupId, + articleId); } public static java.util.List getStructureArticles( - java.lang.String companyId, java.lang.String structureId) - throws com.liferay.portal.SystemException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); return journalArticleLocalService.getStructureArticles(companyId, - structureId); + groupId, structureId); } public static java.util.List getStructureArticles( - java.lang.String companyId, java.lang.String structureId, int begin, - int end, com.liferay.portal.kernel.util.OrderByComparator obc) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, int begin, int end, + com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); return journalArticleLocalService.getStructureArticles(companyId, - structureId, begin, end, obc); + groupId, structureId, begin, end, obc); } public static int getStructureArticlesCount(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); return journalArticleLocalService.getStructureArticlesCount(companyId, - structureId); + groupId, structureId); } public static java.util.List getTemplateArticles( - java.lang.String companyId, java.lang.String templateId) - throws com.liferay.portal.SystemException { + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); return journalArticleLocalService.getTemplateArticles(companyId, - templateId); + groupId, templateId); } public static java.util.List getTemplateArticles( - java.lang.String companyId, java.lang.String templateId, int begin, - int end, com.liferay.portal.kernel.util.OrderByComparator obc) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId, int begin, int end, + com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); return journalArticleLocalService.getTemplateArticles(companyId, - templateId, begin, end, obc); + groupId, templateId, begin, end, obc); } public static int getTemplateArticlesCount(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException { + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); return journalArticleLocalService.getTemplateArticlesCount(companyId, - templateId); + groupId, templateId); } public static boolean isLatestVersion(java.lang.String companyId, - java.lang.String articleId, double version) + java.lang.String groupId, java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.isLatestVersion(companyId, articleId, - version); + return journalArticleLocalService.isLatestVersion(companyId, groupId, + articleId, version); } public static void reIndex(java.lang.String[] ids) @@ -414,14 +464,14 @@ } public static com.liferay.portlet.journal.model.JournalArticle removeArticleLocale( - java.lang.String companyId, java.lang.String articleId, double version, - java.lang.String languageId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); return journalArticleLocalService.removeArticleLocale(companyId, - articleId, version, languageId); + groupId, articleId, version, languageId); } public static com.liferay.portal.kernel.search.Hits search( @@ -483,25 +533,25 @@ } public static com.liferay.portlet.journal.model.JournalArticle updateArticle( - java.lang.String userId, java.lang.String articleId, double version, - boolean incrementVersion, java.lang.String title, - java.lang.String description, java.lang.String content, - java.lang.String type, java.lang.String structureId, - java.lang.String templateId, int displayDateMonth, int displayDateDay, - int displayDateYear, int displayDateHour, int displayDateMinute, - int expirationDateMonth, int expirationDateDay, int expirationDateYear, - int expirationDateHour, int expirationDateMinute, boolean neverExpire, - int reviewDateMonth, int reviewDateDay, int reviewDateYear, - int reviewDateHour, int reviewDateMinute, boolean neverReview, - java.util.Map images, java.lang.String articleURL, - javax.portlet.PortletPreferences prefs) + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, double version, boolean incrementVersion, + java.lang.String title, java.lang.String description, + java.lang.String content, java.lang.String type, + java.lang.String structureId, java.lang.String templateId, + int displayDateMonth, int displayDateDay, int displayDateYear, + int displayDateHour, int displayDateMinute, int expirationDateMonth, + int expirationDateDay, int expirationDateYear, int expirationDateHour, + int expirationDateMinute, boolean neverExpire, int reviewDateMonth, + int reviewDateDay, int reviewDateYear, int reviewDateHour, + int reviewDateMinute, boolean neverReview, java.util.Map images, + java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalArticleLocalService journalArticleLocalService = JournalArticleLocalServiceFactory.getService(); - return journalArticleLocalService.updateArticle(userId, articleId, - version, incrementVersion, title, description, content, type, - structureId, templateId, displayDateMonth, displayDateDay, + return journalArticleLocalService.updateArticle(userId, groupId, + articleId, version, incrementVersion, title, description, content, + type, structureId, templateId, displayDateMonth, displayDateDay, displayDateYear, displayDateHour, displayDateMinute, expirationDateMonth, expirationDateDay, expirationDateYear, expirationDateHour, expirationDateMinute, neverExpire, Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureServiceUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureServiceUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureServiceUtil.java (working copy) @@ -59,30 +59,33 @@ } public static void deleteStructure(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalStructureService journalStructureService = JournalStructureServiceFactory.getService(); - journalStructureService.deleteStructure(companyId, structureId); + journalStructureService.deleteStructure(companyId, groupId, structureId); } public static com.liferay.portlet.journal.model.JournalStructure getStructure( - java.lang.String companyId, java.lang.String structureId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalStructureService journalStructureService = JournalStructureServiceFactory.getService(); - return journalStructureService.getStructure(companyId, structureId); + return journalStructureService.getStructure(companyId, groupId, + structureId); } public static com.liferay.portlet.journal.model.JournalStructure updateStructure( - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsd) + java.lang.String groupId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsd) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalStructureService journalStructureService = JournalStructureServiceFactory.getService(); - return journalStructureService.updateStructure(structureId, name, - description, xsd); + return journalStructureService.updateStructure(groupId, structureId, + name, description, xsd); } } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleLocalService.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleLocalService.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleLocalService.java (working copy) @@ -84,9 +84,30 @@ throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; + public com.liferay.portlet.journal.model.JournalArticle addArticle( + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, boolean autoArticleId, + java.lang.String plid, java.lang.String title, + java.lang.String description, java.lang.String content, + java.lang.String type, java.lang.String structureId, + java.lang.String templateId, int displayDateMonth, int displayDateDay, + int displayDateYear, int displayDateHour, int displayDateMinute, + int expirationDateMonth, int expirationDateDay, int expirationDateYear, + int expirationDateHour, int expirationDateMinute, boolean neverExpire, + int reviewDateMonth, int reviewDateDay, int reviewDateYear, + int reviewDateHour, int reviewDateMinute, boolean neverReview, + java.util.Map images, java.lang.String articleURL, + javax.portlet.PortletPreferences prefs, + java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.SystemException, + com.liferay.portal.PortalException; + public void addArticleResources(java.lang.String companyId, - java.lang.String articleId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String articleId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -97,7 +118,8 @@ com.liferay.portal.PortalException; public void addArticleResources(java.lang.String companyId, - java.lang.String articleId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String articleId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -110,7 +132,8 @@ com.liferay.portal.PortalException; public com.liferay.portlet.journal.model.JournalArticle approveArticle( - java.lang.String userId, java.lang.String articleId, double version, + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -120,12 +143,12 @@ com.liferay.portal.PortalException; public void checkNewLine(java.lang.String companyId, - java.lang.String articleId, double version) + java.lang.String groupId, java.lang.String articleId, double version) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public void deleteArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -141,7 +164,7 @@ com.liferay.portal.PortalException; public void expireArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -153,23 +176,26 @@ com.liferay.portal.PortalException; public com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId, double version) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, java.lang.String languageId, + java.lang.String groupId, java.lang.String articleId, + java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public java.lang.String getArticleContent(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.SystemException, @@ -189,50 +215,56 @@ throws com.liferay.portal.SystemException; public com.liferay.portlet.journal.model.JournalArticle getDisplayArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public com.liferay.portlet.journal.model.JournalArticle getLatestArticle( - java.lang.String companyId, java.lang.String articleId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public com.liferay.portlet.journal.model.JournalArticle getLatestArticle( - java.lang.String companyId, java.lang.String articleId, - java.lang.Boolean approved) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, java.lang.Boolean approved) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public double getLatestVersion(java.lang.String companyId, - java.lang.String articleId) + java.lang.String groupId, java.lang.String articleId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public java.util.List getStructureArticles(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException; + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException; public java.util.List getStructureArticles(java.lang.String companyId, - java.lang.String structureId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + java.lang.String groupId, java.lang.String structureId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException; public int getStructureArticlesCount(java.lang.String companyId, - java.lang.String structureId) throws com.liferay.portal.SystemException; + java.lang.String groupId, java.lang.String structureId) + throws com.liferay.portal.SystemException; public java.util.List getTemplateArticles(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException; + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException; public java.util.List getTemplateArticles(java.lang.String companyId, - java.lang.String templateId, int begin, int end, - com.liferay.portal.kernel.util.OrderByComparator obc) + java.lang.String groupId, java.lang.String templateId, int begin, + int end, com.liferay.portal.kernel.util.OrderByComparator obc) throws com.liferay.portal.SystemException; public int getTemplateArticlesCount(java.lang.String companyId, - java.lang.String templateId) throws com.liferay.portal.SystemException; + java.lang.String groupId, java.lang.String templateId) + throws com.liferay.portal.SystemException; public boolean isLatestVersion(java.lang.String companyId, - java.lang.String articleId, double version) + java.lang.String groupId, java.lang.String articleId, double version) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -240,8 +272,8 @@ throws com.liferay.portal.SystemException; public com.liferay.portlet.journal.model.JournalArticle removeArticleLocale( - java.lang.String companyId, java.lang.String articleId, double version, - java.lang.String languageId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -280,18 +312,18 @@ boolean andOperator) throws com.liferay.portal.SystemException; public com.liferay.portlet.journal.model.JournalArticle updateArticle( - java.lang.String userId, java.lang.String articleId, double version, - boolean incrementVersion, java.lang.String title, - java.lang.String description, java.lang.String content, - java.lang.String type, java.lang.String structureId, - java.lang.String templateId, int displayDateMonth, int displayDateDay, - int displayDateYear, int displayDateHour, int displayDateMinute, - int expirationDateMonth, int expirationDateDay, int expirationDateYear, - int expirationDateHour, int expirationDateMinute, boolean neverExpire, - int reviewDateMonth, int reviewDateDay, int reviewDateYear, - int reviewDateHour, int reviewDateMinute, boolean neverReview, - java.util.Map images, java.lang.String articleURL, - javax.portlet.PortletPreferences prefs) + java.lang.String userId, java.lang.String groupId, + java.lang.String articleId, double version, boolean incrementVersion, + java.lang.String title, java.lang.String description, + java.lang.String content, java.lang.String type, + java.lang.String structureId, java.lang.String templateId, + int displayDateMonth, int displayDateDay, int displayDateYear, + int displayDateHour, int displayDateMinute, int expirationDateMonth, + int expirationDateDay, int expirationDateYear, int expirationDateHour, + int expirationDateMinute, boolean neverExpire, int reviewDateMonth, + int reviewDateDay, int reviewDateYear, int reviewDateHour, + int reviewDateMinute, boolean neverReview, java.util.Map images, + java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureService.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureService.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureService.java (working copy) @@ -47,18 +47,20 @@ com.liferay.portal.PortalException, java.rmi.RemoteException; public void deleteStructure(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalStructure getStructure( - java.lang.String companyId, java.lang.String structureId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalStructure updateStructure( - java.lang.String structureId, java.lang.String name, - java.lang.String description, java.lang.String xsd) + java.lang.String groupId, java.lang.String structureId, + java.lang.String name, java.lang.String description, + java.lang.String xsd) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureLocalServiceUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureLocalServiceUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureLocalServiceUtil.java (working copy) @@ -76,13 +76,32 @@ guestPermissions); } + public static com.liferay.portlet.journal.model.JournalStructure addStructure( + java.lang.String userId, java.lang.String groupId, + java.lang.String structureId, boolean autoStructureId, + java.lang.String plid, java.lang.String name, + java.lang.String description, java.lang.String xsd, + java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.PortalException, + com.liferay.portal.SystemException { + JournalStructureLocalService journalStructureLocalService = JournalStructureLocalServiceFactory.getService(); + + return journalStructureLocalService.addStructure(userId, groupId, + structureId, autoStructureId, plid, name, description, xsd, + addCommunityPermissions, addGuestPermissions, communityPermissions, + guestPermissions); + } + public static void addStructureResources(java.lang.String companyId, - java.lang.String structureId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String structureId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalService journalStructureLocalService = JournalStructureLocalServiceFactory.getService(); - journalStructureLocalService.addStructureResources(companyId, + journalStructureLocalService.addStructureResources(companyId, groupId, structureId, addCommunityPermissions, addGuestPermissions); } @@ -97,12 +116,13 @@ } public static void addStructureResources(java.lang.String companyId, - java.lang.String structureId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String structureId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalService journalStructureLocalService = JournalStructureLocalServiceFactory.getService(); - journalStructureLocalService.addStructureResources(companyId, + journalStructureLocalService.addStructureResources(companyId, groupId, structureId, communityPermissions, guestPermissions); } @@ -118,19 +138,21 @@ } public static void checkNewLine(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalService journalStructureLocalService = JournalStructureLocalServiceFactory.getService(); - journalStructureLocalService.checkNewLine(companyId, structureId); + journalStructureLocalService.checkNewLine(companyId, groupId, + structureId); } public static void deleteStructure(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalService journalStructureLocalService = JournalStructureLocalServiceFactory.getService(); - journalStructureLocalService.deleteStructure(companyId, structureId); + journalStructureLocalService.deleteStructure(companyId, groupId, + structureId); } public static void deleteStructure( @@ -142,12 +164,14 @@ } public static com.liferay.portlet.journal.model.JournalStructure getStructure( - java.lang.String companyId, java.lang.String structureId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalService journalStructureLocalService = JournalStructureLocalServiceFactory.getService(); - return journalStructureLocalService.getStructure(companyId, structureId); + return journalStructureLocalService.getStructure(companyId, groupId, + structureId); } public static java.util.List getStructures(java.lang.String groupId) @@ -194,14 +218,14 @@ } public static com.liferay.portlet.journal.model.JournalStructure updateStructure( - java.lang.String companyId, java.lang.String structureId, - java.lang.String name, java.lang.String description, - java.lang.String xsd) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, java.lang.String name, + java.lang.String description, java.lang.String xsd) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException { JournalStructureLocalService journalStructureLocalService = JournalStructureLocalServiceFactory.getService(); - return journalStructureLocalService.updateStructure(companyId, + return journalStructureLocalService.updateStructure(companyId, groupId, structureId, name, description, xsd); } } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateServiceUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateServiceUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateServiceUtil.java (working copy) @@ -66,34 +66,35 @@ } public static void deleteTemplate(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalTemplateService journalTemplateService = JournalTemplateServiceFactory.getService(); - journalTemplateService.deleteTemplate(companyId, templateId); + journalTemplateService.deleteTemplate(companyId, groupId, templateId); } public static com.liferay.portlet.journal.model.JournalTemplate getTemplate( - java.lang.String companyId, java.lang.String templateId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalTemplateService journalTemplateService = JournalTemplateServiceFactory.getService(); - return journalTemplateService.getTemplate(companyId, templateId); + return journalTemplateService.getTemplate(companyId, groupId, templateId); } public static com.liferay.portlet.journal.model.JournalTemplate updateTemplate( - java.lang.String templateId, java.lang.String structureId, - java.lang.String name, java.lang.String description, - java.lang.String xsl, boolean formatXsl, java.lang.String langType, - boolean smallImage, java.lang.String smallImageURL, - java.io.File smallFile) + java.lang.String groupId, java.lang.String templateId, + java.lang.String structureId, java.lang.String name, + java.lang.String description, java.lang.String xsl, boolean formatXsl, + java.lang.String langType, boolean smallImage, + java.lang.String smallImageURL, java.io.File smallFile) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalTemplateService journalTemplateService = JournalTemplateServiceFactory.getService(); - return journalTemplateService.updateTemplate(templateId, structureId, - name, description, xsl, formatXsl, langType, smallImage, - smallImageURL, smallFile); + return journalTemplateService.updateTemplate(groupId, templateId, + structureId, name, description, xsl, formatXsl, langType, + smallImage, smallImageURL, smallFile); } } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureLocalService.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureLocalService.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalStructureLocalService.java (working copy) @@ -57,9 +57,21 @@ throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; + public com.liferay.portlet.journal.model.JournalStructure addStructure( + java.lang.String userId, java.lang.String groupId, + java.lang.String structureId, boolean autoStructureId, + java.lang.String plid, java.lang.String name, + java.lang.String description, java.lang.String xsd, + java.lang.Boolean addCommunityPermissions, + java.lang.Boolean addGuestPermissions, + java.lang.String[] communityPermissions, + java.lang.String[] guestPermissions) + throws com.liferay.portal.SystemException, + com.liferay.portal.PortalException; + public void addStructureResources(java.lang.String companyId, - java.lang.String structureId, boolean addCommunityPermissions, - boolean addGuestPermissions) + java.lang.String groupId, java.lang.String structureId, + boolean addCommunityPermissions, boolean addGuestPermissions) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -70,7 +82,8 @@ com.liferay.portal.PortalException; public void addStructureResources(java.lang.String companyId, - java.lang.String structureId, java.lang.String[] communityPermissions, + java.lang.String groupId, java.lang.String structureId, + java.lang.String[] communityPermissions, java.lang.String[] guestPermissions) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -83,12 +96,12 @@ com.liferay.portal.PortalException; public void checkNewLine(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; public void deleteStructure(java.lang.String companyId, - java.lang.String structureId) + java.lang.String groupId, java.lang.String structureId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -98,7 +111,8 @@ com.liferay.portal.PortalException; public com.liferay.portlet.journal.model.JournalStructure getStructure( - java.lang.String companyId, java.lang.String structureId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; @@ -124,9 +138,9 @@ throws com.liferay.portal.SystemException; public com.liferay.portlet.journal.model.JournalStructure updateStructure( - java.lang.String companyId, java.lang.String structureId, - java.lang.String name, java.lang.String description, - java.lang.String xsd) + java.lang.String companyId, java.lang.String groupId, + java.lang.String structureId, java.lang.String name, + java.lang.String description, java.lang.String xsd) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException; } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateService.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateService.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalTemplateService.java (working copy) @@ -52,21 +52,22 @@ com.liferay.portal.PortalException, java.rmi.RemoteException; public void deleteTemplate(java.lang.String companyId, - java.lang.String templateId) + java.lang.String groupId, java.lang.String templateId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalTemplate getTemplate( - java.lang.String companyId, java.lang.String templateId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String templateId) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; public com.liferay.portlet.journal.model.JournalTemplate updateTemplate( - java.lang.String templateId, java.lang.String structureId, - java.lang.String name, java.lang.String description, - java.lang.String xsl, boolean formatXsl, java.lang.String langType, - boolean smallImage, java.lang.String smallImageURL, - java.io.File smallFile) + java.lang.String groupId, java.lang.String templateId, + java.lang.String structureId, java.lang.String name, + java.lang.String description, java.lang.String xsl, boolean formatXsl, + java.lang.String langType, boolean smallImage, + java.lang.String smallImageURL, java.io.File smallFile) throws com.liferay.portal.SystemException, com.liferay.portal.PortalException, java.rmi.RemoteException; } \ No newline at end of file Index: C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleServiceUtil.java =================================================================== --- C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleServiceUtil.java (revision 3170) +++ C:/home/jkoz/java/liferay-svn/portal/portal-service/src/com/liferay/portlet/journal/service/JournalArticleServiceUtil.java (working copy) @@ -87,67 +87,71 @@ } public static com.liferay.portlet.journal.model.JournalArticle approveArticle( - java.lang.String articleId, double version, java.lang.String plid, - java.lang.String articleURL, javax.portlet.PortletPreferences prefs) + java.lang.String groupId, java.lang.String articleId, double version, + java.lang.String plid, java.lang.String articleURL, + javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - return journalArticleService.approveArticle(articleId, version, plid, - articleURL, prefs); + return journalArticleService.approveArticle(groupId, articleId, + version, plid, articleURL, prefs); } public static com.liferay.portlet.journal.model.JournalArticle getArticle( - java.lang.String companyId, java.lang.String articleId, double version) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - return journalArticleService.getArticle(companyId, articleId, version); + return journalArticleService.getArticle(companyId, groupId, articleId, + version); } public static java.lang.String getArticleContent( - java.lang.String companyId, java.lang.String articleId, - java.lang.String languageId, + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - return journalArticleService.getArticleContent(companyId, articleId, - languageId, themeDisplay); + return journalArticleService.getArticleContent(companyId, groupId, + articleId, languageId, themeDisplay); } public static java.lang.String getArticleContent( - java.lang.String companyId, java.lang.String articleId, double version, + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId, com.liferay.portal.theme.ThemeDisplay themeDisplay) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - return journalArticleService.getArticleContent(companyId, articleId, - version, languageId, themeDisplay); + return journalArticleService.getArticleContent(companyId, groupId, + articleId, version, languageId, themeDisplay); } public static void deleteArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - journalArticleService.deleteArticle(companyId, articleId, version, - articleURL, prefs); + journalArticleService.deleteArticle(companyId, groupId, articleId, + version, articleURL, prefs); } public static void expireArticle(java.lang.String companyId, - java.lang.String articleId, double version, + java.lang.String groupId, java.lang.String articleId, double version, java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - journalArticleService.expireArticle(companyId, articleId, version, - articleURL, prefs); + journalArticleService.expireArticle(companyId, groupId, articleId, + version, articleURL, prefs); } public static void removeArticleLocale(java.lang.String companyId, @@ -159,36 +163,36 @@ } public static com.liferay.portlet.journal.model.JournalArticle removeArticleLocale( - java.lang.String companyId, java.lang.String articleId, double version, - java.lang.String languageId) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, java.lang.String languageId) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - return journalArticleService.removeArticleLocale(companyId, articleId, - version, languageId); + return journalArticleService.removeArticleLocale(companyId, groupId, + articleId, version, languageId); } public static com.liferay.portlet.journal.model.JournalArticle updateArticle( - java.lang.String companyId, java.lang.String articleId, double version, - boolean incrementVersion, java.lang.String title, - java.lang.String description, java.lang.String content, - java.lang.String type, java.lang.String structureId, - java.lang.String templateId, int displayDateMonth, int displayDateDay, - int displayDateYear, int displayDateHour, int displayDateMinute, - int expirationDateMonth, int expirationDateDay, int expirationDateYear, - int expirationDateHour, int expirationDateMinute, boolean neverExpire, - int reviewDateMonth, int reviewDateDay, int reviewDateYear, - int reviewDateHour, int reviewDateMinute, boolean neverReview, - java.util.Map images, java.lang.String articleURL, - javax.portlet.PortletPreferences prefs) + java.lang.String companyId, java.lang.String groupId, + java.lang.String articleId, double version, boolean incrementVersion, + java.lang.String title, java.lang.String description, + java.lang.String content, java.lang.String type, + java.lang.String structureId, java.lang.String templateId, + int displayDateMonth, int displayDateDay, int displayDateYear, + int displayDateHour, int displayDateMinute, int expirationDateMonth, + int expirationDateDay, int expirationDateYear, int expirationDateHour, + int expirationDateMinute, boolean neverExpire, int reviewDateMonth, + int reviewDateDay, int reviewDateYear, int reviewDateHour, + int reviewDateMinute, boolean neverReview, java.util.Map images, + java.lang.String articleURL, javax.portlet.PortletPreferences prefs) throws com.liferay.portal.PortalException, com.liferay.portal.SystemException, java.rmi.RemoteException { JournalArticleService journalArticleService = JournalArticleServiceFactory.getService(); - return journalArticleService.updateArticle(companyId, articleId, - version, incrementVersion, title, description, content, type, - structureId, templateId, displayDateMonth, displayDateDay, + return journalArticleService.updateArticle(companyId, groupId, + articleId, version, incrementVersion, title, description, content, + type, structureId, templateId, displayDateMonth, displayDateDay, displayDateYear, displayDateHour, displayDateMinute, expirationDateMonth, expirationDateDay, expirationDateYear, expirationDateHour, expirationDateMinute, neverExpire,