Author: erinnp
Date: Fri Aug 9 17:16:05 2013
New Revision: 1512405
URL: http://svn.apache.org/r1512405
Log:
Drop personlist, some api cleanup
Removed:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PersonList.java
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultCategoriesResource.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageForRenderResource.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1512405&r1=1512404&r2=1512405&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
Fri Aug 9 17:16:05 2013
@@ -432,7 +432,7 @@ public class DefaultPageService implemen
public Boolean updateSharedPageStatus(String pageId, String userId, String
shareStatus) {
Page page = this.getPage(pageId);
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUserId().equals(userId)){
+ if(pageUser.getUserId().equals()){
pageUser.setPageStatus(PageInvitationStatus.get(shareStatus));
}
}
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultCategoriesResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultCategoriesResource.java?rev=1512405&r1=1512404&r2=1512405&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultCategoriesResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultCategoriesResource.java
Fri Aug 9 17:16:05 2013
@@ -45,14 +45,12 @@ public class DefaultCategoriesResource i
}
return new SearchResult<Category>(categories,
fromDb.getTotalResults());
-
}
@Override
public Category getCategory(String id) {
org.apache.rave.model.Category fromDb = categoryService.get(id);
- //TODO: with a bad ID a 403 gets thrown before I hit this block. Why?
if(fromDb == null) {
throw new ResourceNotFoundException(id);
}
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageForRenderResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageForRenderResource.java?rev=1512405&r1=1512404&r2=1512405&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageForRenderResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageForRenderResource.java
Fri Aug 9 17:16:05 2013
@@ -25,18 +25,11 @@ import org.apache.rave.portal.service.Pa
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.rest.PagesForRenderResource;
-import org.apache.rave.rest.PagesResource;
import org.apache.rave.rest.model.Page;
import org.apache.rave.rest.model.PageList;
-import org.apache.rave.rest.model.RegionWidget;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.inject.Inject;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
-import java.io.File;
import java.util.Arrays;
import java.util.List;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java?rev=1512405&r1=1512404&r2=1512405&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
Fri Aug 9 17:16:05 2013
@@ -58,10 +58,24 @@ public class DefaultPageResource impleme
return returnPages;
}
+
+ @Override
+ public Page getPage(String id) {
+ logger.debug("Retrieving page for export: " + id);
+ org.apache.rave.model.Page fromDb = pageService.getPage(id);
+ if (fromDb == null) {
+ throw new ResourceNotFoundException(id);
+ }
+ Page responsePage = new Page(fromDb);
+
+ return responsePage;
+ }
+
+
@Override
public Page createPage(Page page) {
//TODO: RAVE-977 - when Page type enum is deprecated escape from this
logic
- if (page.getPageType() == "user") {
+ if (page.getPageType().equals("user")) {
if (page.getName() == null) {
throw new BadRequestException("Page name property must be
defined.");
}
@@ -79,27 +93,6 @@ public class DefaultPageResource impleme
}
@Override
- public Page deletePage(String id) {
- //TODO: this cannot return a 404
- logger.debug("Deleting page " + id);
- pageService.deletePage(id);
- return null;
- }
-
- @Override
- public Page getPage(String id) {
- logger.debug("Retrieving page for export: " + id);
- org.apache.rave.model.Page fromDb = pageService.getPage(id);
- //TODO: with a bad ID a 403 gets thrown before I hit this block. Why?
- if (fromDb == null) {
- throw new ResourceNotFoundException(id);
- }
- Page responsePage = new Page(fromDb);
-
- return responsePage;
- }
-
- @Override
public Page updatePage(String id, Page page) {
if (page.getName() == null) {
throw new BadRequestException("Page name property must be
defined.");
@@ -107,6 +100,7 @@ public class DefaultPageResource impleme
if (page.getPageLayoutCode() == null) {
throw new BadRequestException("Page pageLayoutCode property must
be defined.");
}
+ //TODO: a bad page layout code can corrupt the data
org.apache.rave.model.Page fromDb = pageService.updatePage(id,
page.getName(), page.getPageLayoutCode());
Page responsePage = new Page(fromDb);
@@ -114,6 +108,14 @@ public class DefaultPageResource impleme
}
@Override
+ public Page deletePage(String id) {
+ //TODO: this cannot return a 404
+ logger.debug("Deleting page " + id);
+ pageService.deletePage(id);
+ return null;
+ }
+
+ @Override
public Response getPageOmdl(String id) {
return null;
}
