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 [2/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...
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.model.Authority;
import org.apache.rave.model.PortalPreference;
import org.apache.rave.model.User;
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.PortalPreferenceService;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.model.Category;
import org.apache.rave.model.PortalPreference;
import org.apache.rave.model.Widget;
import org.apache.rave.model.WidgetStatus;
-import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.rest.model.SearchResult;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.WidgetService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java Thu Aug 1 14:16:55 2013
@@ -25,7 +25,7 @@ import org.apache.rave.model.Tag;
import org.apache.rave.model.Widget;
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.model.util.WidgetStatistics;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.PortalPreferenceService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.model.Authority;
import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.AuthorityImpl;
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.PortalPreferenceService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java Thu Aug 1 14:16:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.model.Category;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.CategoryImpl;
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.service.CategoryService;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.WidgetService;
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml Thu Aug 1 14:16:55 2013
@@ -39,6 +39,7 @@
<jaxrs:providers>
<bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
<bean class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/>
+ <ref bean="JsonWrapperResponseFilter"/>
</jaxrs:providers>
<jaxrs:serviceBeans>
<ref bean="peopleBean"/>
@@ -49,12 +50,6 @@
</jaxrs:serviceBeans>
</jaxrs:server>
- <cxf:bus>
- <cxf:outInterceptors>
- <ref bean="JsonResponseWrapperInterceptor" />
- </cxf:outInterceptors>
- </cxf:bus>
-
<bean id="peopleBean" class="org.apache.rave.rest.impl.DefaultPeopleResource">
<property name="userService" ref="userService"/>
</bean>
@@ -71,6 +66,6 @@
<bean id="pagesBean" class="org.apache.rave.rest.impl.DefaultPageResource" autowire="byType" />
<bean id="pagesForRenderBean" class="org.apache.rave.rest.impl.DefaultPageForRenderResource" autowire="byType" />
- <bean id="JsonResponseWrapperInterceptor" class="org.apache.rave.rest.interceptor.JsonResponseWrapperInterceptor"/>
+ <bean id="JsonWrapperResponseFilter" class="org.apache.rave.rest.filters.JsonWrapperResponseFilter"/>
</beans>
\ No newline at end of file
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp Thu Aug 1 14:16:55 2013
@@ -58,7 +58,7 @@
</c:otherwise>
</c:choose>
<h2>${listheader}</h2>
- <%--@elvariable id="widgets" type="org.apache.rave.portal.model.util.SearchResult"--%>
+ <%--@elvariable id="widgets" type="org.apache.rave.rest.model.SearchResult"--%>
<c:if test="${widgets.totalResults gt 0}">
<c:if test="${widgets.numberOfPages gt 1}">
<div>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp Thu Aug 1 14:16:55 2013
@@ -117,7 +117,7 @@
</fieldset>
<fieldset>
<span class="control-label"><fmt:message key="admin.userdata.authorities"/></span>
- <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.model.Authority>"--%>
+ <%--@elvariable id="authorities" type="org.apache.rave.rest.model.SearchResult<org.apache.rave.model.Authority>"--%>
<ul class="checkboxlist">
<form:checkboxes path="authorities" items="${authorities.resultSet}" itemLabel="authority" itemValue="authority" element="li"/>
</ul>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp Thu Aug 1 14:16:55 2013
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.model.User>"--%>
+<%--@elvariable id="searchResult" type="org.apache.rave.rest.model.SearchResult<org.apache.rave.model.User>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp Thu Aug 1 14:16:55 2013
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.model.Widget>"--%>
+<%--@elvariable id="searchResult" type="org.apache.rave.rest.model.SearchResult<org.apache.rave.model.Widget>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Thu Aug 1 14:16:55 2013
@@ -51,7 +51,7 @@
</c:otherwise>
</c:choose>
<h2>${listheader}</h2>
-<%--@elvariable id="widgets" type="org.apache.rave.portal.model.util.SearchResult"--%>
+<%--@elvariable id="widgets" type="org.apache.rave.rest.model.SearchResult"--%>
<c:if test="${widgets.totalResults gt 0}">
<c:if test="${widgets.numberOfPages gt 1}">
<div>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag?rev=1509242&r1=1509241&r2=1509242&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag Thu Aug 1 14:16:55 2013
@@ -20,7 +20,7 @@ under the License.
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult"--%>
+<%--@elvariable id="searchResult" type="org.apache.rave.rest.model.SearchResult"--%>
<c:if test="${searchResult.pageSize lt searchResult.totalResults}">
<%-- offset is 0 based, pages 1 based --%>
<div class="pagination">