You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by er...@apache.org on 2013/08/01 16:16:56 UTC
svn commit: r1509242 [1/2] - in /rave/trunk:
rave-components/rave-core-api/src/main/java/org/apache/rave/rest/
rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/
rave-components/rave-core-api/src/main/java/org/apache/rave/rest/mo...
Author: erinnp
Date: Thu Aug 1 14:16:55 2013
New Revision: 1509242
URL: http://svn.apache.org/r1509242
Log:
Use cxf subresources for page /region /regionwidgets
Added:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionWidgetsResource.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionsResource.java
- copied, changed from r1506125, rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/JsonWrapperResponseFilter.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/SearchResult.java
- copied, changed from r1506125, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/SearchResult.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionsResource.java
- copied, changed from r1508584, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
Removed:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/SearchResult.java
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/JsonResponseWrapper.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
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/portal/service/impl/DefaultPortalPreferenceService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/SearchResultTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PersonApi.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag
Modified: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java Thu Aug 1 14:16:55 2013
@@ -41,7 +41,7 @@ public interface PagesResource {
*/
@GET
@Path("/")
- @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
Response getPages();
/**
@@ -76,7 +76,7 @@ public interface PagesResource {
@GET
@Path("/{pageId}")
@Produces(MediaType.APPLICATION_JSON)
- Page getPage(@PathParam("pageId") String id);
+ Response getPage(@PathParam("pageId") String id);
/**
* Updates the given page
@@ -102,137 +102,12 @@ public interface PagesResource {
@Produces({"application/vnd.omdl+xml"})
Response getPageOmdl(@PathParam("pageId") String pageId);
- /*
- --- Region Operations
- */
-
/**
- * Returns the regions associated with a page
+ * Delegates to the RegionsResource sub-resource.
*
* @param pageId the page id
* @return
*/
- @GET
@Path("/{pageId}/regions")
- @Produces(MediaType.APPLICATION_JSON)
- Response getPageRegions(@PathParam("pageId") String pageId);
-
- /**
- * Creates a new page region
- *
- * @param pageId the page id
- * @param region the definition of the region
- * @return
- */
- @POST
- @Path("/{pageId}/regions")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- Response createPageRegion(@PathParam("pageId") String pageId, Region region);
-
- /**
- * Returns a particular region associated with a page
- *
- * @param pageId the page id
- * @param regionId the region id
- * @return
- */
- @GET
- @Path("/{pageId}/regions/{regionId}")
- @Produces(MediaType.APPLICATION_JSON)
- Response getPageRegion(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId);
-
- /**
- * Update a page region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @param region the new region definition
- * @return
- */
- @PUT
- @Path("/{pageId}/regions/{regionId}")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- Response updatePageRegion(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId, Region region);
-
- /**
- * Deletes a page region
- *
- * @param pageId the id of the page
- * @param regionId the region id
- * @return
- */
- @DELETE
- @Path("/{pageId}/regions/{regionId}")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- Response deletePageRegion(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId);
-
- /*
- --- RegionWidget Operations
- */
-
- /**
- * Returns the regionWidgets associated with a page and a region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @return
- */
- @GET
- @Path("/{pageId}/regions/{regionId}/regionWidgets")
- @Produces(MediaType.APPLICATION_JSON)
- Response getPageRegionRegionWidgets(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId);
-
- @POST
- @Path("/{pageId}/regions/{regionId}/regionWidgets")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- Response createPageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- RegionWidget regionWidget);
-
- /**
- * Returns a regionWidget associated with a page and a region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @param regionWidgetId the regionWidget id
- * @return
- */
- @GET
- @Path("/{pageId}/regions/{regionId}/regionWidgets/{regionWidgetId}")
- @Produces(MediaType.APPLICATION_JSON)
- Response getPageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- @PathParam("regionWidgetId") String regionWidgetId);
-
- /**
- * Updates a regionWidget associated with a page and a region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @param regionWidgetId the regionWidget id
- * @param regionWidget the new regionWidget definition
- * @return
- */
- @PUT
- @Path("/{pageId}/regions/{regionId}/regionWidgets/{regionWidgetId}")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- Response updatePageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- @PathParam("regionWidgetId") String regionWidgetId, RegionWidget regionWidget);
-
- /**
- * Deletes a regionWidget from a page region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @param regionWidgetId the regionWidget id
- * @return
- */
- @DELETE
- @Path("/{pageId}/regions/{regionId}/regionWidgets/{regionWidgetId}")
- @Produces(MediaType.APPLICATION_JSON)
- Response deletePageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- @PathParam("regionWidgetId") String regionWidgetId);
+ RegionsResource getRegionsResource(@PathParam("pageId") String pageId);
}
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionWidgetsResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionWidgetsResource.java?rev=1509242&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionWidgetsResource.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionWidgetsResource.java Thu Aug 1 14:16:55 2013
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.rest;
+
+import org.apache.rave.rest.model.Page;
+import org.apache.rave.rest.model.Region;
+import org.apache.rave.rest.model.RegionWidget;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/pages")
+public interface RegionWidgetsResource {
+
+ /*
+ --- RegionWidget Operations
+ */
+
+ /**
+ * Returns the regionWidgets associated with a page and a region
+ *
+ * @return
+ */
+ @GET
+ @Path("/")
+ @Produces(MediaType.APPLICATION_JSON)
+ Response getPageRegionRegionWidgets();
+
+ @POST
+ @Path("/")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ Response createPageRegionRegionWidget(RegionWidget regionWidget);
+
+ /**
+ * Returns a regionWidget associated with a page and a region
+ *
+ * @param regionWidgetId the regionWidget id
+ * @return
+ */
+ @GET
+ @Path("/{regionWidgetId}")
+ @Produces(MediaType.APPLICATION_JSON)
+ Response getPageRegionRegionWidget(@PathParam("regionWidgetId") String regionWidgetId);
+
+ /**
+ * Updates a regionWidget associated with a page and a region
+ *
+ * @param regionWidgetId the regionWidget id
+ * @param regionWidget the new regionWidget definition
+ * @return
+ */
+ @PUT
+ @Path("/{regionWidgetId}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ Response updatePageRegionRegionWidget(@PathParam("regionWidgetId") String regionWidgetId, RegionWidget regionWidget);
+
+ /**
+ * Deletes a regionWidget from a page region
+ *
+ * @param regionWidgetId the regionWidget id
+ * @return
+ */
+ @DELETE
+ @Path("/{regionWidgetId}")
+ @Produces(MediaType.APPLICATION_JSON)
+ Response deletePageRegionRegionWidget(@PathParam("regionWidgetId") String regionWidgetId);
+}
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionsResource.java (from r1506125, rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionsResource.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionsResource.java&p1=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java&r1=1506125&r2=1509242&rev=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/RegionsResource.java Thu Aug 1 14:16:55 2013
@@ -27,80 +27,7 @@ import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-@Path("/pages")
-public interface PagesResource {
-
- /*
- --- Page operations
- */
-
- /**
- * Returns a list of pages
- *
- * @return
- */
- @GET
- @Path("/")
- @Consumes(MediaType.APPLICATION_JSON)
- Response getPages();
-
- /**
- * Creates a new page
- *
- * @param page the definition of the new page
- * @return
- */
- @POST
- @Path("/")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- Response createPage(Page page);
-
- /**
- * Deletes the given page
- *
- * @param pageId ID of the page on which the operation is to take place
- * @return
- */
- @DELETE
- @Path("/{pageId}")
- Response deletePage(@PathParam("pageId") String pageId);
-
- /**
- * Returns the given page
- *
- *
- * @param id ID of the page on which the operation is to take place
- * @return
- */
- @GET
- @Path("/{pageId}")
- @Produces(MediaType.APPLICATION_JSON)
- Page getPage(@PathParam("pageId") String id);
-
- /**
- * Updates the given page
- *
- * @param pageId ID of the page on which the operation is to take place
- * @param page the new definition of the page
- * @return
- */
- @PUT
- @Path("/{pageId}")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- Response updatePage(@PathParam("pageId") String pageId, Page page);
-
- /**
- * Returns the OMDL representation of the page
- *
- * @param pageId ID of the page on which the operation is to take place
- * @return
- */
- @GET
- @Path("/{pageId}")
- @Produces({"application/vnd.omdl+xml"})
- Response getPageOmdl(@PathParam("pageId") String pageId);
+public interface RegionsResource {
/*
--- Region Operations
@@ -109,130 +36,71 @@ public interface PagesResource {
/**
* Returns the regions associated with a page
*
- * @param pageId the page id
* @return
*/
@GET
- @Path("/{pageId}/regions")
+ @Path("/")
@Produces(MediaType.APPLICATION_JSON)
- Response getPageRegions(@PathParam("pageId") String pageId);
+ Response getPageRegions();
/**
* Creates a new page region
*
- * @param pageId the page id
* @param region the definition of the region
* @return
*/
@POST
- @Path("/{pageId}/regions")
+ @Path("/")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- Response createPageRegion(@PathParam("pageId") String pageId, Region region);
+ Response createPageRegion( Region region);
/**
* Returns a particular region associated with a page
*
- * @param pageId the page id
* @param regionId the region id
* @return
*/
@GET
- @Path("/{pageId}/regions/{regionId}")
+ @Path("/{regionId}")
@Produces(MediaType.APPLICATION_JSON)
- Response getPageRegion(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId);
+ Response getPageRegion( @PathParam("regionId") String regionId);
/**
* Update a page region
*
- * @param pageId the page id
* @param regionId the region id
* @param region the new region definition
* @return
*/
@PUT
- @Path("/{pageId}/regions/{regionId}")
+ @Path("/{regionId}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- Response updatePageRegion(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId, Region region);
+ Response updatePageRegion( @PathParam("regionId") String regionId, Region region);
/**
* Deletes a page region
*
- * @param pageId the id of the page
* @param regionId the region id
* @return
*/
@DELETE
- @Path("/{pageId}/regions/{regionId}")
+ @Path("/{regionId}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- Response deletePageRegion(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId);
+ Response deletePageRegion( @PathParam("regionId") String regionId);
/*
--- RegionWidget Operations
*/
/**
- * Returns the regionWidgets associated with a page and a region
+ * Delegates to the RegionWidgetsResource sub-resource
*
- * @param pageId the page id
* @param regionId the region id
* @return
*/
- @GET
- @Path("/{pageId}/regions/{regionId}/regionWidgets")
- @Produces(MediaType.APPLICATION_JSON)
- Response getPageRegionRegionWidgets(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId);
-
- @POST
- @Path("/{pageId}/regions/{regionId}/regionWidgets")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- Response createPageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- RegionWidget regionWidget);
-
- /**
- * Returns a regionWidget associated with a page and a region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @param regionWidgetId the regionWidget id
- * @return
- */
- @GET
- @Path("/{pageId}/regions/{regionId}/regionWidgets/{regionWidgetId}")
- @Produces(MediaType.APPLICATION_JSON)
- Response getPageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- @PathParam("regionWidgetId") String regionWidgetId);
-
- /**
- * Updates a regionWidget associated with a page and a region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @param regionWidgetId the regionWidget id
- * @param regionWidget the new regionWidget definition
- * @return
- */
- @PUT
- @Path("/{pageId}/regions/{regionId}/regionWidgets/{regionWidgetId}")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- Response updatePageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- @PathParam("regionWidgetId") String regionWidgetId, RegionWidget regionWidget);
-
- /**
- * Deletes a regionWidget from a page region
- *
- * @param pageId the page id
- * @param regionId the region id
- * @param regionWidgetId the regionWidget id
- * @return
- */
- @DELETE
- @Path("/{pageId}/regions/{regionId}/regionWidgets/{regionWidgetId}")
- @Produces(MediaType.APPLICATION_JSON)
- Response deletePageRegionRegionWidget(@PathParam("pageId") String pageId, @PathParam("regionId") String regionId,
- @PathParam("regionWidgetId") String regionWidgetId);
+ @Path("/{regionId}/regionWidgets")
+ RegionWidgetsResource getRegionWidgetsResource( @PathParam("regionId") String regionId);
}
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/JsonWrapperResponseFilter.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/JsonWrapperResponseFilter.java?rev=1509242&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/JsonWrapperResponseFilter.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/JsonWrapperResponseFilter.java Thu Aug 1 14:16:55 2013
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.rest.filters;
+
+import org.apache.cxf.jaxrs.ext.ResponseHandler;
+import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+import org.apache.cxf.message.Message;
+import org.apache.rave.rest.model.JsonResponseWrapper;
+import org.apache.rave.rest.model.SearchResult;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.util.List;
+
+public class JsonWrapperResponseFilter implements ContainerResponseFilter {
+
+ @Override
+ public void filter(ContainerRequestContext containerRequestContext, ContainerResponseContext containerResponseContext) throws IOException {
+ Object o = containerResponseContext.getEntity();
+ JsonResponseWrapper wrapper;
+
+ Class clazz = o.getClass();
+ if (List.class.isAssignableFrom(clazz)) {
+ wrapper = new JsonResponseWrapper((List) o);
+ } else if (SearchResult.class.isAssignableFrom(clazz)) {
+ wrapper = new JsonResponseWrapper((SearchResult) o);
+ } else {
+ wrapper = new JsonResponseWrapper(o);
+ }
+
+ containerResponseContext.setEntity(wrapper, containerResponseContext.getEntityAnnotations(), containerResponseContext.getMediaType());
+ }
+}
Modified: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/JsonResponseWrapper.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/JsonResponseWrapper.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/JsonResponseWrapper.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/JsonResponseWrapper.java Thu Aug 1 14:16:55 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.rave.rest.model;
import java.util.HashMap;
@@ -15,6 +34,20 @@ public class JsonResponseWrapper {
private HashMap<String, String> metadata;
private Object data;
+ public JsonResponseWrapper(SearchResult searchResult) {
+ this.metadata = new HashMap<String, String>();
+ this.data = searchResult.getResultSet();
+
+ buildPaginationData(searchResult.getPageSize(), searchResult.getOffset(), searchResult.getTotalResults());
+ }
+
+ public JsonResponseWrapper(List list) {
+ this.metadata = new HashMap<String, String>();
+ this.data = list;
+
+ buildPaginationData(0, 0, list.size());
+ }
+
//constructor for single resource objects
public JsonResponseWrapper(Object data) {
this.metadata = new HashMap<String, String>();
@@ -29,26 +62,29 @@ public class JsonResponseWrapper {
buildPaginationData(limit, offset, count);
}
- private void buildPaginationData(Integer limit, Integer offset, Integer count){
+ private void buildPaginationData(Integer limit, Integer offset, Integer count) {
Integer prevOffset = null;
Integer nextOffset = null;
- if(offset > 0) {
+ //if limit = 0, then we return full data set and there is no pagination
+ if (limit > 0) {
//build prev offset
- prevOffset = offset - limit;
- if(prevOffset < 0) {
- prevOffset = 0;
+ if (offset > 0) {
+ prevOffset = offset - limit;
+ if (prevOffset < 0) {
+ prevOffset = 0;
+ }
}
- }
- if(limit+offset < count) {
//build next offset
- nextOffset = limit+offset;
+ if (limit + offset < count) {
+ nextOffset = limit + offset;
+ }
}
- if(prevOffset != null) {
+ if (prevOffset != null) {
this.metadata.put("prev", "?limit=" + limit + "&offset=" + prevOffset);
}
- if(nextOffset != null) {
+ if (nextOffset != null) {
this.metadata.put("next", "?limit=" + limit + "&offset=" + nextOffset);
}
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/SearchResult.java (from r1506125, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/SearchResult.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/SearchResult.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/SearchResult.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/SearchResult.java&r1=1506125&r2=1509242&rev=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/SearchResult.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/SearchResult.java Thu Aug 1 14:16:55 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.model.util;
+package org.apache.rave.rest.model;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java Thu Aug 1 14:16:55 2013
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.ExternalWidgetImpl;
+import org.apache.rave.rest.model.SearchResult;
/**
* Wrapper for a set of search results from an external marketplace,
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java Thu Aug 1 14:16:55 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.service;
import org.apache.rave.model.Authority;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
public interface AuthorityService {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java Thu Aug 1 14:16:55 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service;
import org.apache.rave.model.Category;
import org.apache.rave.model.User;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PostFilter;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -55,7 +55,7 @@ public interface CategoryService {
/**
- * Gets a limited {@link org.apache.rave.portal.model.util.SearchResult} for {@link Category}'s that a user can add to their
+ * Gets a limited {@link org.apache.rave.rest.model.SearchResult} for {@link Category}'s that a user can add to their
* context.
*
* @param offset start point within the resultset (for paging)
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java Thu Aug 1 14:16:55 2013
@@ -22,7 +22,7 @@ import org.apache.rave.model.Page;
import org.apache.rave.model.PageType;
import org.apache.rave.model.Region;
import org.apache.rave.model.RegionWidget;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PreAuthorize;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java Thu Aug 1 14:16:55 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.service;
import org.apache.rave.model.PortalPreference;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import java.util.List;
import java.util.Map;
@@ -47,7 +47,7 @@ public interface PortalPreferenceService
//TODO: Put correct spring security annotations on following three methods (getAll, getLimitedList, getCountAll)
/**
- * Gets a {@link org.apache.rave.portal.model.util.SearchResult} for {@link PortalPreference}'s that a user can add to their context
+ * Gets a {@link org.apache.rave.rest.model.SearchResult} for {@link PortalPreference}'s that a user can add to their context
* <p/>
* May return a very large resultset
*
@@ -57,7 +57,7 @@ public interface PortalPreferenceService
/**
- * Gets a limited {@link org.apache.rave.portal.model.util.SearchResult} for {@link PortalPreference}'s that a user can add to their
+ * Gets a limited {@link org.apache.rave.rest.model.SearchResult} for {@link PortalPreference}'s that a user can add to their
* context.
*
* @param offset start point within the resultset (for paging)
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java Thu Aug 1 14:16:55 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service;
import org.apache.rave.model.Region;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.springframework.security.access.prepost.PreAuthorize;
public interface RegionService {
@@ -33,7 +33,7 @@ public interface RegionService {
//TODO: Put correct spring security annotations on following three methods (getAll, getLimitedList, getCountAll)
/**
- * Gets a {@link org.apache.rave.portal.model.util.SearchResult} for {@link Region}'s that a user can add to their context
+ * Gets a {@link org.apache.rave.rest.model.SearchResult} for {@link Region}'s that a user can add to their context
* <p/>
* May return a very large resultset
*
@@ -43,7 +43,7 @@ public interface RegionService {
/**
- * Gets a limited {@link org.apache.rave.portal.model.util.SearchResult} for {@link Region}'s that a user can add to their
+ * Gets a limited {@link org.apache.rave.rest.model.SearchResult} for {@link Region}'s that a user can add to their
* context.
*
* @param offset start point within the resultset (for paging)
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java Thu Aug 1 14:16:55 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service;
import org.apache.rave.model.RegionWidget;
import org.apache.rave.model.RegionWidgetPreference;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,7 +39,7 @@ public interface RegionWidgetService {
//TODO: Put correct spring security annotations on following three methods (getAll, getLimitedList, getCountAll)
/**
- * Gets a {@link org.apache.rave.portal.model.util.SearchResult} for {@link RegionWidget}'s that a user can add to their context
+ * Gets a {@link org.apache.rave.rest.model.SearchResult} for {@link RegionWidget}'s that a user can add to their context
* <p/>
* May return a very large resultset
*
@@ -49,7 +49,7 @@ public interface RegionWidgetService {
/**
- * Gets a limited {@link org.apache.rave.portal.model.util.SearchResult} for {@link RegionWidget}'s that a user can add to their
+ * Gets a limited {@link org.apache.rave.rest.model.SearchResult} for {@link RegionWidget}'s that a user can add to their
* context.
*
* @param offset start point within the resultset (for paging)
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java Thu Aug 1 14:16:55 2013
@@ -20,9 +20,8 @@
package org.apache.rave.portal.service;
import org.apache.rave.model.Tag;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
-import javax.swing.text.html.parser.TagElement;
import java.util.List;
public interface TagService {
@@ -35,13 +34,13 @@ public interface TagService {
/**
- * @return a {@link org.apache.rave.portal.model.util.SearchResult} with all {@link org.apache.rave.model.Tag}'s
+ * @return a {@link org.apache.rave.rest.model.SearchResult} with all {@link org.apache.rave.model.Tag}'s
*/
List<Tag> getAllTagsList();
//TODO: Put correct spring security annotations on following three methods (getAll, getLimitedList, getCountAll)
/**
- * Gets a {@link org.apache.rave.portal.model.util.SearchResult} for {@link Tag}'s that a user can add to their context
+ * Gets a {@link org.apache.rave.rest.model.SearchResult} for {@link Tag}'s that a user can add to their context
* <p/>
* May return a very large resultset
*
@@ -51,7 +50,7 @@ public interface TagService {
/**
- * Gets a limited {@link org.apache.rave.portal.model.util.SearchResult} for {@link Tag}'s that a user can add to their
+ * Gets a limited {@link org.apache.rave.rest.model.SearchResult} for {@link Tag}'s that a user can add to their
* context.
*
* @param offset start point within the resultset (for paging)
@@ -68,7 +67,7 @@ public interface TagService {
Tag getTagByKeyword(String keyword);
/**
- * @return a {@link org.apache.rave.portal.model.util.SearchResult} with all {@link org.apache.rave.model.Tag}'s
+ * @return a {@link org.apache.rave.rest.model.SearchResult} with all {@link org.apache.rave.model.Tag}'s
* Not link to a widget
*/
//List<Tag> getAvailableTagsByWidgetId(String widgetId);
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java Thu Aug 1 14:16:55 2013
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.rave.model.Person;
import org.apache.rave.model.User;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.openid.OpenIDAuthenticationToken;
@@ -89,7 +89,7 @@ public interface UserService extends Use
//TODO: Put correct spring security annotations on following three methods (getAll, getLimitedList, getCountAll)
/**
- * Gets a {@link org.apache.rave.portal.model.util.SearchResult} for {@link User}'s that a user can add to their context
+ * Gets a {@link org.apache.rave.rest.model.SearchResult} for {@link User}'s that a user can add to their context
* <p/>
* May return a very large resultset
*
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java Thu Aug 1 14:16:55 2013
@@ -22,7 +22,7 @@ package org.apache.rave.portal.service;
import java.util.List;
import org.apache.rave.model.Widget;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
/**
* Provides capabilities for discovering widgets
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.model.Widget;
import org.apache.rave.model.WidgetComment;
import org.apache.rave.model.WidgetRating;
import org.apache.rave.model.WidgetTag;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PreAuthorize;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java Thu Aug 1 14:16:55 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.model.Authority;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.AuthorityRepository;
import org.apache.rave.portal.service.AuthorityService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java Thu Aug 1 14:16:55 2013
@@ -18,7 +18,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.model.Category;
import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.model.User;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.service.CategoryService;
import org.springframework.beans.factory.annotation.Autowired;
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=1509242&r1=1509241&r2=1509242&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 Thu Aug 1 14:16:55 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.repository.Repository;
import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.PageImpl;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.portal.events.Por
import org.apache.rave.portal.events.RaveEventManager;
import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java Thu Aug 1 14:16:55 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.model.Region;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.RegionRepository;
import org.apache.rave.portal.service.RegionService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUt
import org.apache.rave.model.RegionWidget;
import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.util.ModelUtils;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.apache.rave.portal.service.RegionWidgetService;
import org.apache.rave.synchronization.annotation.Synchronized;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java Thu Aug 1 14:16:55 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.model.Tag;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.service.TagService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Thu Aug 1 14:16:55 2013
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUt
import org.apache.rave.model.PageType;
import org.apache.rave.model.Person;
import org.apache.rave.model.User;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java Thu Aug 1 14:16:55 2013
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.rave.model.PortalPreference;
import org.apache.rave.model.Widget;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.model.util.WidgetMarketplaceSearchResult;
import org.apache.rave.portal.model.util.WidgetMarketplaceWidgetResult;
import org.apache.rave.portal.service.PortalPreferenceService;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java Thu Aug 1 14:16:55 2013
@@ -28,7 +28,7 @@ import org.apache.rave.model.WidgetComme
import org.apache.rave.model.WidgetRating;
import org.apache.rave.model.WidgetStatus;
import org.apache.rave.model.WidgetTag;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.UserRepository;
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=1509242&r1=1509241&r2=1509242&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 Thu Aug 1 14:16:55 2013
@@ -22,6 +22,7 @@ package org.apache.rave.rest.impl;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.rest.PagesResource;
+import org.apache.rave.rest.RegionsResource;
import org.apache.rave.rest.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,8 +37,7 @@ public class DefaultPageResource impleme
@Override
public Response getPages() {
- //pageService.getAllPagesForUserType();
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return Response.ok(pageService.getAll()).build();
}
@Override
@@ -54,11 +54,11 @@ public class DefaultPageResource impleme
}
@Override
- public Page getPage(String id) {
+ public Response getPage(String id) {
logger.debug("Retrieving page for export: " + id);
org.apache.rave.model.Page fromDb = pageService.getPage(id);
- return new Page(fromDb);
+ return Response.ok(new Page(fromDb)).build();
}
@Override
@@ -75,53 +75,11 @@ public class DefaultPageResource impleme
}
@Override
- public Response getPageRegions(String pageId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response createPageRegion(String pageId, Region region) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response getPageRegion(String id, String regionId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response updatePageRegion(String pageId, String regionId, Region region) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response deletePageRegion(String pageId, String regionId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
+ public RegionsResource getRegionsResource(String pageId) {
+ org.apache.rave.model.Page fromDb = pageService.getPage(pageId);
+ Page page = new Page(fromDb);
- @Override
- public Response createPageRegionRegionWidget(String pageId, String regionId, RegionWidget regionWidget) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response getPageRegionRegionWidgets(String id, String regionId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response getPageRegionRegionWidget(String id, String regionId, String regionWidgetId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response updatePageRegionRegionWidget(String pageId, String regionId, String regionWidgetId, RegionWidget regionWidget) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response deletePageRegionRegionWidget(String pageId, String regionId, String regionWidgetId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return new DefaultRegionsResource(page);
}
@Inject
Added: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java?rev=1509242&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java (added)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java Thu Aug 1 14:16:55 2013
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.rest.impl;
+
+
+import org.apache.rave.portal.service.PageService;
+import org.apache.rave.portal.service.RegionWidgetService;
+import org.apache.rave.rest.RegionWidgetsResource;
+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.core.Response;
+
+public class DefaultRegionWidgetsResource implements RegionWidgetsResource {
+
+ private Logger logger = LoggerFactory.getLogger(getClass());
+ private RegionWidgetService regionWidgetService;
+
+ @Inject
+ public void setRegionWidgetService(RegionWidgetService regionWidgetService) {
+ this.regionWidgetService = regionWidgetService;
+ }
+
+ @Override
+ public Response getPageRegionRegionWidgets() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response createPageRegionRegionWidget(RegionWidget regionWidget) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response getPageRegionRegionWidget(@PathParam("regionWidgetId") String regionWidgetId) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response updatePageRegionRegionWidget(@PathParam("regionWidgetId") String regionWidgetId, RegionWidget regionWidget) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response deletePageRegionRegionWidget(@PathParam("regionWidgetId") String regionWidgetId) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+}
Copied: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionsResource.java (from r1508584, 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/DefaultRegionsResource.java?p2=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionsResource.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java&r1=1508584&r2=1509242&rev=1509242&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/DefaultRegionsResource.java Thu Aug 1 14:16:55 2013
@@ -21,111 +21,57 @@ package org.apache.rave.rest.impl;
import org.apache.rave.portal.service.PageService;
-import org.apache.rave.rest.PagesResource;
-import org.apache.rave.rest.model.*;
+import org.apache.rave.portal.service.RegionService;
+import org.apache.rave.rest.RegionWidgetsResource;
+import org.apache.rave.rest.RegionsResource;
+import org.apache.rave.rest.model.Page;
+import org.apache.rave.rest.model.Region;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
+import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
+import java.util.List;
-public class DefaultPageResource implements PagesResource {
+public class DefaultRegionsResource implements RegionsResource {
private Logger logger = LoggerFactory.getLogger(getClass());
+ private RegionService regionService;
private PageService pageService;
+ private Page page;
- @Override
- public Response getPages() {
- //pageService.getAllPagesForUserType();
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response createPage(Page page) {
- //pageService.createPage(page)
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response deletePage(String id) {
- logger.debug("Deleting page " + id);
- pageService.deletePage(id);
- return Response.noContent().build();
- }
-
- @Override
- public Page getPage(String id) {
- logger.debug("Retrieving page for export: " + id);
- org.apache.rave.model.Page fromDb = pageService.getPage(id);
-
- return new Page(fromDb);
- }
-
- @Override
- public Response updatePage(String id, Page page) {
- org.apache.rave.model.Page fromDb = pageService.updatePage(id, page.getName(), page.getPageLayoutCode());
- Page responsePage = new Page(fromDb);
-
- return Response.ok(new JsonResponseWrapper(responsePage)).build();
+ public DefaultRegionsResource(Page page) {
+ this.page = page;
}
@Override
- public Response getPageOmdl(String id) {
- return null;
+ public Response getPageRegions() {
+ return Response.ok(page.getRegions()).build();
}
@Override
- public Response getPageRegions(String pageId) {
+ public Response createPageRegion(Region region) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@Override
- public Response createPageRegion(String pageId, Region region) {
+ public Response getPageRegion(String regionId) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@Override
- public Response getPageRegion(String id, String regionId) {
+ public Response updatePageRegion(String regionId, Region region) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@Override
- public Response updatePageRegion(String pageId, String regionId, Region region) {
+ public Response deletePageRegion(String regionId) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@Override
- public Response deletePageRegion(String pageId, String regionId) {
+ public RegionWidgetsResource getRegionWidgetsResource(String regionId) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
-
- @Override
- public Response createPageRegionRegionWidget(String pageId, String regionId, RegionWidget regionWidget) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response getPageRegionRegionWidgets(String id, String regionId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response getPageRegionRegionWidget(String id, String regionId, String regionWidgetId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response updatePageRegionRegionWidget(String pageId, String regionId, String regionWidgetId, RegionWidget regionWidget) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Response deletePageRegionRegionWidget(String pageId, String regionId, String regionWidgetId) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Inject
- public void setPageService(PageService pageService) {
- this.pageService = pageService;
- }
}
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/SearchResultTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/SearchResultTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/SearchResultTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/SearchResultTest.java Thu Aug 1 14:16:55 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.model.util;
+import org.apache.rave.rest.model.SearchResult;
import org.junit.Before;
import org.junit.Test;
@@ -28,7 +29,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
/**
- * Test for {@link SearchResult}
+ * Test for {@link org.apache.rave.rest.model.SearchResult}
*/
public class SearchResultTest {
SearchResult searchResult;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java Thu Aug 1 14:16:55 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.model.Authority;
import org.apache.rave.portal.model.impl.AuthorityImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.AuthorityRepository;
import org.apache.rave.portal.service.AuthorityService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.model.Category;
import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.model.impl.UserImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.impl.mock.MockCategoryRepository;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java Thu Aug 1 14:16:55 2013
@@ -24,7 +24,7 @@ import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.model.impl.PageLayoutImpl;
import org.apache.rave.portal.model.impl.UserImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.PageLayoutService;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java Thu Aug 1 14:16:55 2013
@@ -36,7 +36,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java Thu Aug 1 14:16:55 2013
@@ -22,7 +22,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.events.RaveEventManager;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionServiceTest.java Thu Aug 1 14:16:55 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.*;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.RegionRepository;
import org.apache.rave.portal.service.RegionService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java Thu Aug 1 14:16:55 2013
@@ -28,7 +28,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.apache.rave.portal.service.RegionWidgetService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java Thu Aug 1 14:16:55 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.model.Tag;
import org.apache.rave.portal.model.impl.TagImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.service.TagService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java Thu Aug 1 14:16:55 2013
@@ -24,7 +24,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageTemplateImpl;
import org.apache.rave.portal.model.impl.UserImpl;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.rave.model.Widget;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.RemoteWidgetResolverService;
import org.apache.rave.portal.service.WidgetMarketplaceService;
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java Thu Aug 1 14:16:55 2013
@@ -22,7 +22,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.exception.DuplicateItemException;
import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.*;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.UserRepository;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PersonApi.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PersonApi.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PersonApi.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PersonApi.java Thu Aug 1 14:16:55 2013
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.List;
import org.apache.rave.model.Person;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.api.rpc.model.RpcOperation;
import org.apache.rave.portal.web.api.rpc.model.RpcResult;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java Thu Aug 1 14:16:55 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.web.api.rpc;
import org.apache.rave.model.Widget;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.service.WidgetMetadataResolver;
import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.api.rpc.model.RpcOperation;