Lps 100067

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleLocalizationModel.java

@@ -16,6 +16,7 @@
 
 import com.liferay.portal.kernel.bean.AutoEscape;
 import com.liferay.portal.kernel.model.BaseModel;
+import com.liferay.portal.kernel.model.MVCCModel;
 import com.liferay.portal.kernel.model.ShardedModel;
 
 import org.osgi.annotation.versioning.ProviderType;
@@ -33,7 +34,7 @@
  */
 @ProviderType
 public interface JournalArticleLocalizationModel
-	extends BaseModel<JournalArticleLocalization>, ShardedModel {
+	extends BaseModel<JournalArticleLocalization>, MVCCModel, ShardedModel {
 
 	/*
 	 * NOTE FOR DEVELOPERS:
@@ -55,6 +56,22 @@ public interface JournalArticleLocalizationModel
 	 */
 	public void setPrimaryKey(long primaryKey);
 
+	/**
+	 * Returns the mvcc version of this journal article localization.
+	 *
+	 * @return the mvcc version of this journal article localization
+	 */
+	@Override
+	public long getMvccVersion();
+
+	/**
+	 * Sets the mvcc version of this journal article localization.
+	 *
+	 * @param mvccVersion the mvcc version of this journal article localization
+	 */
+	@Override
+	public void setMvccVersion(long mvccVersion);
+
 	/**
 	 * Returns the article localization ID of this journal article localization.
 	 *

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleLocalizationSoap.java

@@ -36,6 +36,7 @@ public static JournalArticleLocalizationSoap toSoapModel(
 		JournalArticleLocalizationSoap soapModel =
 			new JournalArticleLocalizationSoap();
 
+		soapModel.setMvccVersion(model.getMvccVersion());
 		soapModel.setArticleLocalizationId(model.getArticleLocalizationId());
 		soapModel.setCompanyId(model.getCompanyId());
 		soapModel.setArticlePK(model.getArticlePK());
@@ -105,6 +106,14 @@ public void setPrimaryKey(long pk) {
 		setArticleLocalizationId(pk);
 	}
 
+	public long getMvccVersion() {
+		return _mvccVersion;
+	}
+
+	public void setMvccVersion(long mvccVersion) {
+		_mvccVersion = mvccVersion;
+	}
+
 	public long getArticleLocalizationId() {
 		return _articleLocalizationId;
 	}
@@ -153,6 +162,7 @@ public void setLanguageId(String languageId) {
 		_languageId = languageId;
 	}
 
+	private long _mvccVersion;
 	private long _articleLocalizationId;
 	private long _companyId;
 	private long _articlePK;

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleLocalizationWrapper.java

@@ -47,6 +47,7 @@ public JournalArticleLocalizationWrapper(
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
+		attributes.put("mvccVersion", getMvccVersion());
 		attributes.put("articleLocalizationId", getArticleLocalizationId());
 		attributes.put("companyId", getCompanyId());
 		attributes.put("articlePK", getArticlePK());
@@ -59,6 +60,12 @@ public Map<String, Object> getModelAttributes() {
 
 	@Override
 	public void setModelAttributes(Map<String, Object> attributes) {
+		Long mvccVersion = (Long)attributes.get("mvccVersion");
+
+		if (mvccVersion != null) {
+			setMvccVersion(mvccVersion);
+		}
+
 		Long articleLocalizationId = (Long)attributes.get(
 			"articleLocalizationId");
 
@@ -147,6 +154,16 @@ public String getLanguageId() {
 		return model.getLanguageId();
 	}
 
+	/**
+	 * Returns the mvcc version of this journal article localization.
+	 *
+	 * @return the mvcc version of this journal article localization
+	 */
+	@Override
+	public long getMvccVersion() {
+		return model.getMvccVersion();
+	}
+
 	/**
 	 * Returns the primary key of this journal article localization.
 	 *
@@ -217,6 +234,16 @@ public void setLanguageId(String languageId) {
 		model.setLanguageId(languageId);
 	}
 
+	/**
+	 * Sets the mvcc version of this journal article localization.
+	 *
+	 * @param mvccVersion the mvcc version of this journal article localization
+	 */
+	@Override
+	public void setMvccVersion(long mvccVersion) {
+		model.setMvccVersion(mvccVersion);
+	}
+
 	/**
 	 * Sets the primary key of this journal article localization.
 	 *

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleModel.java

@@ -18,6 +18,7 @@
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.model.AttachedModel;
 import com.liferay.portal.kernel.model.BaseModel;
+import com.liferay.portal.kernel.model.MVCCModel;
 import com.liferay.portal.kernel.model.ResourcedModel;
 import com.liferay.portal.kernel.model.ShardedModel;
 import com.liferay.portal.kernel.model.StagedGroupedModel;
@@ -41,7 +42,7 @@
  */
 @ProviderType
 public interface JournalArticleModel
-	extends AttachedModel, BaseModel<JournalArticle>, ResourcedModel,
+	extends AttachedModel, BaseModel<JournalArticle>, MVCCModel, ResourcedModel,
 			ShardedModel, StagedGroupedModel, TrashedModel, WorkflowedModel {
 
 	/*
@@ -64,6 +65,22 @@ public interface JournalArticleModel
 	 */
 	public void setPrimaryKey(long primaryKey);
 
+	/**
+	 * Returns the mvcc version of this journal article.
+	 *
+	 * @return the mvcc version of this journal article
+	 */
+	@Override
+	public long getMvccVersion();
+
+	/**
+	 * Sets the mvcc version of this journal article.
+	 *
+	 * @param mvccVersion the mvcc version of this journal article
+	 */
+	@Override
+	public void setMvccVersion(long mvccVersion);
+
 	/**
 	 * Returns the uuid of this journal article.
 	 *

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleResourceModel.java

@@ -16,6 +16,7 @@
 
 import com.liferay.portal.kernel.bean.AutoEscape;
 import com.liferay.portal.kernel.model.BaseModel;
+import com.liferay.portal.kernel.model.MVCCModel;
 import com.liferay.portal.kernel.model.ShardedModel;
 
 import org.osgi.annotation.versioning.ProviderType;
@@ -33,7 +34,7 @@
  */
 @ProviderType
 public interface JournalArticleResourceModel
-	extends BaseModel<JournalArticleResource>, ShardedModel {
+	extends BaseModel<JournalArticleResource>, MVCCModel, ShardedModel {
 
 	/*
 	 * NOTE FOR DEVELOPERS:
@@ -55,6 +56,22 @@ public interface JournalArticleResourceModel
 	 */
 	public void setPrimaryKey(long primaryKey);
 
+	/**
+	 * Returns the mvcc version of this journal article resource.
+	 *
+	 * @return the mvcc version of this journal article resource
+	 */
+	@Override
+	public long getMvccVersion();
+
+	/**
+	 * Sets the mvcc version of this journal article resource.
+	 *
+	 * @param mvccVersion the mvcc version of this journal article resource
+	 */
+	@Override
+	public void setMvccVersion(long mvccVersion);
+
 	/**
 	 * Returns the uuid of this journal article resource.
 	 *

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleResourceSoap.java

@@ -35,6 +35,7 @@ public static JournalArticleResourceSoap toSoapModel(
 
 		JournalArticleResourceSoap soapModel = new JournalArticleResourceSoap();
 
+		soapModel.setMvccVersion(model.getMvccVersion());
 		soapModel.setUuid(model.getUuid());
 		soapModel.setResourcePrimKey(model.getResourcePrimKey());
 		soapModel.setGroupId(model.getGroupId());
@@ -102,6 +103,14 @@ public void setPrimaryKey(long pk) {
 		setResourcePrimKey(pk);
 	}
 
+	public long getMvccVersion() {
+		return _mvccVersion;
+	}
+
+	public void setMvccVersion(long mvccVersion) {
+		_mvccVersion = mvccVersion;
+	}
+
 	public String getUuid() {
 		return _uuid;
 	}
@@ -142,6 +151,7 @@ public void setArticleId(String articleId) {
 		_articleId = articleId;
 	}
 
+	private long _mvccVersion;
 	private String _uuid;
 	private long _resourcePrimKey;
 	private long _groupId;

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleResourceWrapper.java

@@ -46,6 +46,7 @@ public JournalArticleResourceWrapper(
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
+		attributes.put("mvccVersion", getMvccVersion());
 		attributes.put("uuid", getUuid());
 		attributes.put("resourcePrimKey", getResourcePrimKey());
 		attributes.put("groupId", getGroupId());
@@ -57,6 +58,12 @@ public Map<String, Object> getModelAttributes() {
 
 	@Override
 	public void setModelAttributes(Map<String, Object> attributes) {
+		Long mvccVersion = (Long)attributes.get("mvccVersion");
+
+		if (mvccVersion != null) {
+			setMvccVersion(mvccVersion);
+		}
+
 		String uuid = (String)attributes.get("uuid");
 
 		if (uuid != null) {
@@ -123,6 +130,16 @@ public long getLatestArticlePK() {
 		return model.getLatestArticlePK();
 	}
 
+	/**
+	 * Returns the mvcc version of this journal article resource.
+	 *
+	 * @return the mvcc version of this journal article resource
+	 */
+	@Override
+	public long getMvccVersion() {
+		return model.getMvccVersion();
+	}
+
 	/**
 	 * Returns the primary key of this journal article resource.
 	 *
@@ -188,6 +205,16 @@ public void setGroupId(long groupId) {
 		model.setGroupId(groupId);
 	}
 
+	/**
+	 * Sets the mvcc version of this journal article resource.
+	 *
+	 * @param mvccVersion the mvcc version of this journal article resource
+	 */
+	@Override
+	public void setMvccVersion(long mvccVersion) {
+		model.setMvccVersion(mvccVersion);
+	}
+
 	/**
 	 * Sets the primary key of this journal article resource.
 	 *

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleSoap.java

@@ -34,6 +34,7 @@ public class JournalArticleSoap implements Serializable {
 	public static JournalArticleSoap toSoapModel(JournalArticle model) {
 		JournalArticleSoap soapModel = new JournalArticleSoap();
 
+		soapModel.setMvccVersion(model.getMvccVersion());
 		soapModel.setUuid(model.getUuid());
 		soapModel.setId(model.getId());
 		soapModel.setResourcePrimKey(model.getResourcePrimKey());
@@ -125,6 +126,14 @@ public void setPrimaryKey(long pk) {
 		setId(pk);
 	}
 
+	public long getMvccVersion() {
+		return _mvccVersion;
+	}
+
+	public void setMvccVersion(long mvccVersion) {
+		_mvccVersion = mvccVersion;
+	}
+
 	public String getUuid() {
 		return _uuid;
 	}
@@ -397,6 +406,7 @@ public void setStatusDate(Date statusDate) {
 		_statusDate = statusDate;
 	}
 
+	private long _mvccVersion;
 	private String _uuid;
 	private long _id;
 	private long _resourcePrimKey;

modules/apps/journal/journal-api/src/main/java/com/liferay/journal/model/JournalArticleWrapper.java

@@ -46,6 +46,7 @@ public JournalArticleWrapper(JournalArticle journalArticle) {
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
+		attributes.put("mvccVersion", getMvccVersion());
 		attributes.put("uuid", getUuid());
 		attributes.put("id", getId());
 		attributes.put("resourcePrimKey", getResourcePrimKey());
@@ -85,6 +86,12 @@ public Map<String, Object> getModelAttributes() {
 
 	@Override
 	public void setModelAttributes(Map<String, Object> attributes) {
+		Long mvccVersion = (Long)attributes.get("mvccVersion");
+
+		if (mvccVersion != null) {
+			setMvccVersion(mvccVersion);
+		}
+
 		String uuid = (String)attributes.get("uuid");
 
 		if (uuid != null) {
@@ -658,6 +665,16 @@ public Date getModifiedDate() {
 		return model.getModifiedDate();
 	}
 
+	/**
+	 * Returns the mvcc version of this journal article.
+	 *
+	 * @return the mvcc version of this journal article
+	 */
+	@Override
+	public long getMvccVersion() {
+		return model.getMvccVersion();
+	}
+
 	/**
 	 * Returns the primary key of this journal article.
 	 *
@@ -1311,6 +1328,16 @@ public void setModifiedDate(Date modifiedDate) {
 		model.setModifiedDate(modifiedDate);
 	}
 
+	/**
+	 * Sets the mvcc version of this journal article.
+	 *
+	 * @param mvccVersion the mvcc version of this journal article
+	 */
+	@Override
+	public void setMvccVersion(long mvccVersion) {
+		model.setMvccVersion(mvccVersion);
+	}
+
 	/**
 	 * Sets the primary key of this journal article.
 	 *