diff --git a/portal-impl/src/META-INF/portal-hbm.xml b/portal-impl/src/META-INF/portal-hbm.xml
index 0aa4ca42b75342..42fe664b194a8c 100644
--- a/portal-impl/src/META-INF/portal-hbm.xml
+++ b/portal-impl/src/META-INF/portal-hbm.xml
@@ -1011,7 +1011,6 @@
-
diff --git a/portal-impl/src/META-INF/portal-model-hints.xml b/portal-impl/src/META-INF/portal-model-hints.xml
index f7e61364880920..48a601e419b915 100644
--- a/portal-impl/src/META-INF/portal-model-hints.xml
+++ b/portal-impl/src/META-INF/portal-model-hints.xml
@@ -1680,7 +1680,6 @@
-
diff --git a/portal-impl/src/com/liferay/portal/model/impl/UserGroupCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/UserGroupCacheModel.java
index 01b4205ec2d8f6..11806c75961ddc 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/UserGroupCacheModel.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/UserGroupCacheModel.java
@@ -79,7 +79,7 @@ public void setMvccVersion(long mvccVersion) {
@Override
public String toString() {
- StringBundler sb = new StringBundler(27);
+ StringBundler sb = new StringBundler(25);
sb.append("{mvccVersion=");
sb.append(mvccVersion);
@@ -105,8 +105,6 @@ public String toString() {
sb.append(description);
sb.append(", addedByLDAPImport=");
sb.append(addedByLDAPImport);
- sb.append(", lastPublishDate=");
- sb.append(lastPublishDate);
sb.append("}");
return sb.toString();
@@ -168,13 +166,6 @@ public UserGroup toEntityModel() {
userGroupImpl.setAddedByLDAPImport(addedByLDAPImport);
- if (lastPublishDate == Long.MIN_VALUE) {
- userGroupImpl.setLastPublishDate(null);
- }
- else {
- userGroupImpl.setLastPublishDate(new Date(lastPublishDate));
- }
-
userGroupImpl.resetOriginalValues();
return userGroupImpl;
@@ -199,7 +190,6 @@ public void readExternal(ObjectInput objectInput) throws IOException {
description = objectInput.readUTF();
addedByLDAPImport = objectInput.readBoolean();
- lastPublishDate = objectInput.readLong();
}
@Override
@@ -247,7 +237,6 @@ public void writeExternal(ObjectOutput objectOutput)
}
objectOutput.writeBoolean(addedByLDAPImport);
- objectOutput.writeLong(lastPublishDate);
}
public long mvccVersion;
@@ -262,5 +251,4 @@ public void writeExternal(ObjectOutput objectOutput)
public String name;
public String description;
public boolean addedByLDAPImport;
- public long lastPublishDate;
}
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/model/impl/UserGroupModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/UserGroupModelImpl.java
index 8477393e0fe84f..5eff44c8389e40 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/UserGroupModelImpl.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/UserGroupModelImpl.java
@@ -83,8 +83,7 @@ public class UserGroupModelImpl extends BaseModelImpl
{ "parentUserGroupId", Types.BIGINT },
{ "name", Types.VARCHAR },
{ "description", Types.VARCHAR },
- { "addedByLDAPImport", Types.BOOLEAN },
- { "lastPublishDate", Types.TIMESTAMP }
+ { "addedByLDAPImport", Types.BOOLEAN }
};
public static final Map TABLE_COLUMNS_MAP = new HashMap();
@@ -101,10 +100,9 @@ public class UserGroupModelImpl extends BaseModelImpl
TABLE_COLUMNS_MAP.put("name", Types.VARCHAR);
TABLE_COLUMNS_MAP.put("description", Types.VARCHAR);
TABLE_COLUMNS_MAP.put("addedByLDAPImport", Types.BOOLEAN);
- TABLE_COLUMNS_MAP.put("lastPublishDate", Types.TIMESTAMP);
}
- public static final String TABLE_SQL_CREATE = "create table UserGroup (mvccVersion LONG default 0 not null,uuid_ VARCHAR(75) null,userGroupId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,parentUserGroupId LONG,name VARCHAR(75) null,description STRING null,addedByLDAPImport BOOLEAN,lastPublishDate DATE null)";
+ public static final String TABLE_SQL_CREATE = "create table UserGroup (mvccVersion LONG default 0 not null,uuid_ VARCHAR(75) null,userGroupId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,parentUserGroupId LONG,name VARCHAR(75) null,description STRING null,addedByLDAPImport BOOLEAN)";
public static final String TABLE_SQL_DROP = "drop table UserGroup";
public static final String ORDER_BY_JPQL = " ORDER BY userGroup.name ASC";
public static final String ORDER_BY_SQL = " ORDER BY UserGroup.name ASC";
@@ -150,7 +148,6 @@ public static UserGroup toModel(UserGroupSoap soapModel) {
model.setName(soapModel.getName());
model.setDescription(soapModel.getDescription());
model.setAddedByLDAPImport(soapModel.getAddedByLDAPImport());
- model.setLastPublishDate(soapModel.getLastPublishDate());
return model;
}
@@ -254,7 +251,6 @@ public Map getModelAttributes() {
attributes.put("name", getName());
attributes.put("description", getDescription());
attributes.put("addedByLDAPImport", getAddedByLDAPImport());
- attributes.put("lastPublishDate", getLastPublishDate());
attributes.put("entityCacheEnabled", isEntityCacheEnabled());
attributes.put("finderCacheEnabled", isFinderCacheEnabled());
@@ -335,12 +331,6 @@ public void setModelAttributes(Map attributes) {
if (addedByLDAPImport != null) {
setAddedByLDAPImport(addedByLDAPImport);
}
-
- Date lastPublishDate = (Date)attributes.get("lastPublishDate");
-
- if (lastPublishDate != null) {
- setLastPublishDate(lastPublishDate);
- }
}
@JSON
@@ -564,17 +554,6 @@ public void setAddedByLDAPImport(boolean addedByLDAPImport) {
_addedByLDAPImport = addedByLDAPImport;
}
- @JSON
- @Override
- public Date getLastPublishDate() {
- return _lastPublishDate;
- }
-
- @Override
- public void setLastPublishDate(Date lastPublishDate) {
- _lastPublishDate = lastPublishDate;
- }
-
@Override
public StagedModelType getStagedModelType() {
return new StagedModelType(PortalUtil.getClassNameId(
@@ -624,7 +603,6 @@ public Object clone() {
userGroupImpl.setName(getName());
userGroupImpl.setDescription(getDescription());
userGroupImpl.setAddedByLDAPImport(getAddedByLDAPImport());
- userGroupImpl.setLastPublishDate(getLastPublishDate());
userGroupImpl.resetOriginalValues();
@@ -768,21 +746,12 @@ public CacheModel toCacheModel() {
userGroupCacheModel.addedByLDAPImport = getAddedByLDAPImport();
- Date lastPublishDate = getLastPublishDate();
-
- if (lastPublishDate != null) {
- userGroupCacheModel.lastPublishDate = lastPublishDate.getTime();
- }
- else {
- userGroupCacheModel.lastPublishDate = Long.MIN_VALUE;
- }
-
return userGroupCacheModel;
}
@Override
public String toString() {
- StringBundler sb = new StringBundler(27);
+ StringBundler sb = new StringBundler(25);
sb.append("{mvccVersion=");
sb.append(getMvccVersion());
@@ -808,8 +777,6 @@ public String toString() {
sb.append(getDescription());
sb.append(", addedByLDAPImport=");
sb.append(getAddedByLDAPImport());
- sb.append(", lastPublishDate=");
- sb.append(getLastPublishDate());
sb.append("}");
return sb.toString();
@@ -817,7 +784,7 @@ public String toString() {
@Override
public String toXmlString() {
- StringBundler sb = new StringBundler(43);
+ StringBundler sb = new StringBundler(40);
sb.append("");
sb.append("com.liferay.portal.kernel.model.UserGroup");
@@ -871,10 +838,6 @@ public String toXmlString() {
"addedByLDAPImport");
- sb.append(
- "lastPublishDate");
sb.append("");
@@ -904,7 +867,6 @@ public String toXmlString() {
private String _originalName;
private String _description;
private boolean _addedByLDAPImport;
- private Date _lastPublishDate;
private long _columnBitmask;
private UserGroup _escapedModel;
}
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/UserGroupPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/UserGroupPersistenceImpl.java
index 2a7aaf428b84ef..fc88c3928f46c1 100644
--- a/portal-impl/src/com/liferay/portal/service/persistence/impl/UserGroupPersistenceImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/UserGroupPersistenceImpl.java
@@ -4500,7 +4500,6 @@ protected UserGroup toUnwrappedModel(UserGroup userGroup) {
userGroupImpl.setName(userGroup.getName());
userGroupImpl.setDescription(userGroup.getDescription());
userGroupImpl.setAddedByLDAPImport(userGroup.isAddedByLDAPImport());
- userGroupImpl.setLastPublishDate(userGroup.getLastPublishDate());
return userGroupImpl;
}
diff --git a/portal-impl/test/integration/com/liferay/portal/service/persistence/test/UserGroupPersistenceTest.java b/portal-impl/test/integration/com/liferay/portal/service/persistence/test/UserGroupPersistenceTest.java
index e3cf06fae3580b..9767b3bf95e267 100644
--- a/portal-impl/test/integration/com/liferay/portal/service/persistence/test/UserGroupPersistenceTest.java
+++ b/portal-impl/test/integration/com/liferay/portal/service/persistence/test/UserGroupPersistenceTest.java
@@ -140,8 +140,6 @@ public void testUpdateExisting() throws Exception {
newUserGroup.setAddedByLDAPImport(RandomTestUtil.randomBoolean());
- newUserGroup.setLastPublishDate(RandomTestUtil.nextDate());
-
_userGroups.add(_persistence.update(newUserGroup));
UserGroup existingUserGroup = _persistence.findByPrimaryKey(newUserGroup.getPrimaryKey());
@@ -170,9 +168,6 @@ public void testUpdateExisting() throws Exception {
newUserGroup.getDescription());
Assert.assertEquals(existingUserGroup.getAddedByLDAPImport(),
newUserGroup.getAddedByLDAPImport());
- Assert.assertEquals(Time.getShortTimestamp(
- existingUserGroup.getLastPublishDate()),
- Time.getShortTimestamp(newUserGroup.getLastPublishDate()));
}
@Test
@@ -244,8 +239,7 @@ protected OrderByComparator getOrderByComparator() {
true, "uuid", true, "userGroupId", true, "companyId", true,
"userId", true, "userName", true, "createDate", true,
"modifiedDate", true, "parentUserGroupId", true, "name", true,
- "description", true, "addedByLDAPImport", true, "lastPublishDate",
- true);
+ "description", true, "addedByLDAPImport", true);
}
@Test
@@ -483,8 +477,6 @@ protected UserGroup addUserGroup() throws Exception {
userGroup.setAddedByLDAPImport(RandomTestUtil.randomBoolean());
- userGroup.setLastPublishDate(RandomTestUtil.nextDate());
-
_userGroups.add(_persistence.update(userGroup));
return userGroup;
diff --git a/portal-service/src/com/liferay/portal/kernel/model/UserGroupModel.java b/portal-service/src/com/liferay/portal/kernel/model/UserGroupModel.java
index 9b68c84cb2da45..1c208ca46234e3 100644
--- a/portal-service/src/com/liferay/portal/kernel/model/UserGroupModel.java
+++ b/portal-service/src/com/liferay/portal/kernel/model/UserGroupModel.java
@@ -270,20 +270,6 @@ public interface UserGroupModel extends BaseModel, MVCCModel,
*/
public void setAddedByLDAPImport(boolean addedByLDAPImport);
- /**
- * Returns the last publish date of this user group.
- *
- * @return the last publish date of this user group
- */
- public Date getLastPublishDate();
-
- /**
- * Sets the last publish date of this user group.
- *
- * @param lastPublishDate the last publish date of this user group
- */
- public void setLastPublishDate(Date lastPublishDate);
-
@Override
public boolean isNew();
diff --git a/portal-service/src/com/liferay/portal/kernel/model/UserGroupSoap.java b/portal-service/src/com/liferay/portal/kernel/model/UserGroupSoap.java
index 6a91f7e207ddf8..43dfccee238212 100644
--- a/portal-service/src/com/liferay/portal/kernel/model/UserGroupSoap.java
+++ b/portal-service/src/com/liferay/portal/kernel/model/UserGroupSoap.java
@@ -46,7 +46,6 @@ public static UserGroupSoap toSoapModel(UserGroup model) {
soapModel.setName(model.getName());
soapModel.setDescription(model.getDescription());
soapModel.setAddedByLDAPImport(model.getAddedByLDAPImport());
- soapModel.setLastPublishDate(model.getLastPublishDate());
return soapModel;
}
@@ -199,14 +198,6 @@ public void setAddedByLDAPImport(boolean addedByLDAPImport) {
_addedByLDAPImport = addedByLDAPImport;
}
- public Date getLastPublishDate() {
- return _lastPublishDate;
- }
-
- public void setLastPublishDate(Date lastPublishDate) {
- _lastPublishDate = lastPublishDate;
- }
-
private long _mvccVersion;
private String _uuid;
private long _userGroupId;
@@ -219,5 +210,4 @@ public void setLastPublishDate(Date lastPublishDate) {
private String _name;
private String _description;
private boolean _addedByLDAPImport;
- private Date _lastPublishDate;
}
\ No newline at end of file
diff --git a/portal-service/src/com/liferay/portal/kernel/model/UserGroupWrapper.java b/portal-service/src/com/liferay/portal/kernel/model/UserGroupWrapper.java
index c3079e3d023f3a..62bda281669eff 100644
--- a/portal-service/src/com/liferay/portal/kernel/model/UserGroupWrapper.java
+++ b/portal-service/src/com/liferay/portal/kernel/model/UserGroupWrapper.java
@@ -70,7 +70,6 @@ public Map getModelAttributes() {
attributes.put("name", getName());
attributes.put("description", getDescription());
attributes.put("addedByLDAPImport", getAddedByLDAPImport());
- attributes.put("lastPublishDate", getLastPublishDate());
return attributes;
}
@@ -148,12 +147,6 @@ public void setModelAttributes(Map attributes) {
if (addedByLDAPImport != null) {
setAddedByLDAPImport(addedByLDAPImport);
}
-
- Date lastPublishDate = (Date)attributes.get("lastPublishDate");
-
- if (lastPublishDate != null) {
- setLastPublishDate(lastPublishDate);
- }
}
@Override
@@ -223,16 +216,6 @@ public long getGroupId()
return _userGroup.getGroupId();
}
- /**
- * Returns the last publish date of this user group.
- *
- * @return the last publish date of this user group
- */
- @Override
- public Date getLastPublishDate() {
- return _userGroup.getLastPublishDate();
- }
-
/**
* Returns the modified date of this user group.
*
@@ -457,16 +440,6 @@ public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
_userGroup.setExpandoBridgeAttributes(serviceContext);
}
- /**
- * Sets the last publish date of this user group.
- *
- * @param lastPublishDate the last publish date of this user group
- */
- @Override
- public void setLastPublishDate(Date lastPublishDate) {
- _userGroup.setLastPublishDate(lastPublishDate);
- }
-
/**
* Sets the modified date of this user group.
*
diff --git a/sql/portal-tables.sql b/sql/portal-tables.sql
index 34d5296df9c239..800c47f0fa3560 100644
--- a/sql/portal-tables.sql
+++ b/sql/portal-tables.sql
@@ -1604,8 +1604,7 @@ create table UserGroup (
parentUserGroupId LONG,
name VARCHAR(75) null,
description STRING null,
- addedByLDAPImport BOOLEAN,
- lastPublishDate DATE null
+ addedByLDAPImport BOOLEAN
);
create table UserGroupGroupRole (