SYNC-1231 Regen

liferay · Apr 17, 2014 · 7c41479 · 7c41479
1 parent 9246ea1
commit 7c41479
Show file tree

Hide file tree

Showing 11 changed files with 264 additions and 147 deletions.
diff --git a/webs/sync-web/docroot/WEB-INF/lib/sync-web-service.jar b/webs/sync-web/docroot/WEB-INF/lib/sync-web-service.jar
diff --git a/webs/sync-web/docroot/WEB-INF/service/com/liferay/sync/model/SyncDLObjectClp.java b/webs/sync-web/docroot/WEB-INF/service/com/liferay/sync/model/SyncDLObjectClp.java
@@ -15,13 +15,16 @@
 package com.liferay.sync.model;
 
 import com.liferay.portal.kernel.bean.AutoEscapeBeanHandler;
+import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.ProxyUtil;
 import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.model.BaseModel;
+import com.liferay.portal.model.User;
 import com.liferay.portal.model.impl.BaseModelImpl;
-import com.liferay.portal.util.PortalUtil;
+import com.liferay.portal.service.UserLocalServiceUtil;
 
 import com.liferay.sync.service.ClpSerializer;
 import com.liferay.sync.service.SyncDLObjectLocalServiceUtil;
@@ -660,12 +663,18 @@ public void setLockUserId(long lockUserId) {
 
 	@Override
 	public String getLockUserUuid() throws SystemException {
-		return PortalUtil.getUserValue(getLockUserId(), "uuid", _lockUserUuid);
+		try {
+			User user = UserLocalServiceUtil.getUserById(getLockUserId());
+
+			return user.getUuid();
+		}
+		catch (PortalException pe) {
+			return StringPool.BLANK;
+		}
 	}
 
 	@Override
 	public void setLockUserUuid(String lockUserUuid) {
-		_lockUserUuid = lockUserUuid;
 	}
 
 	@Override
@@ -1146,7 +1155,6 @@ public String toXmlString() {
 	private String _event;
 	private Date _lockExpirationDate;
 	private long _lockUserId;
-	private String _lockUserUuid;
 	private String _lockUserName;
 	private String _type;
 	private long _typePK;

diff --git a/webs/sync-web/docroot/WEB-INF/service/com/liferay/sync/service/SyncDLObjectService.java b/webs/sync-web/docroot/WEB-INF/service/com/liferay/sync/service/SyncDLObjectService.java
@@ -103,6 +103,16 @@ public com.liferay.sync.model.SyncDLObject checkOutFileEntry(
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	/**
+	* @deprecated As of 7.0.0, with no direct replacement
+	*/
+	@Deprecated
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public com.liferay.sync.model.SyncDLObjectUpdate getAllSyncDLObjects(
+		long repositoryId, long folderId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public com.liferay.sync.model.SyncDLObject getFileEntrySyncDLObject(
 		long groupId, long folderId, java.lang.String title)