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/07/23 17:57:54 UTC
svn commit: r1506129 - in /rave/branches/angular: ./
rave-components/rave-core-api/src/main/java/org/apache/rave/rest/
rave-components/rave-core-api/src/main/java/org/apache/rave/rest/interceptor/
rave-components/rave-core/src/main/java/org/apache/rave...
Author: erinnp
Date: Tue Jul 23 15:57:53 2013
New Revision: 1506129
URL: http://svn.apache.org/r1506129
Log:
merge changes from trunk
Added:
rave/branches/angular/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/interceptor/
- copied from r1506125, rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/interceptor/
rave/branches/angular/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/interceptor/JsonResponseWrapperInterceptor.java
- copied unchanged from r1506125, rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/interceptor/JsonResponseWrapperInterceptor.java
Modified:
rave/branches/angular/ (props changed)
rave/branches/angular/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java
rave/branches/angular/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
rave/branches/angular/rave-portal-resources/src/main/resources/requireBuild.js
rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/requireConfig.js
Propchange: rave/branches/angular/
------------------------------------------------------------------------------
Merged /rave/trunk:r1506068-1506125
Modified: rave/branches/angular/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java?rev=1506129&r1=1506128&r2=1506129&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java (original)
+++ rave/branches/angular/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PagesResource.java Tue Jul 23 15:57:53 2013
@@ -69,13 +69,14 @@ public interface PagesResource {
/**
* Returns the given page
*
- * @param pageId ID of the page on which the operation is to take place
+ *
+ * @param id ID of the page on which the operation is to take place
* @return
*/
@GET
@Path("/{pageId}")
@Produces(MediaType.APPLICATION_JSON)
- Response getPage(@PathParam("pageId") String pageId);
+ Page getPage(@PathParam("pageId") String id);
/**
* Updates the given page
Modified: rave/branches/angular/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java?rev=1506129&r1=1506128&r2=1506129&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java (original)
+++ rave/branches/angular/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java Tue Jul 23 15:57:53 2013
@@ -20,10 +20,7 @@
package org.apache.rave.rest.impl;
-import com.google.common.collect.Lists;
import org.apache.rave.portal.service.PageService;
-import org.apache.rave.portal.service.UserService;
-import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.rest.PagesResource;
import org.apache.rave.rest.model.*;
import org.slf4j.Logger;
@@ -55,17 +52,11 @@ public class DefaultPageResource impleme
}
@Override
- public Response getPage(String id) {
+ public Page getPage(String id) {
logger.debug("Retrieving page for export: " + id);
org.apache.rave.model.Page fromDb = pageService.getPage(id);
- if(fromDb == null) {
- return Response.status(Response.Status.NOT_FOUND).build();
- }
- else {
- Page responsePage = new Page(fromDb);
- return Response.ok(new JsonResponseWrapper(responsePage)).build();
- }
+ return new Page(fromDb);
}
@Override
Modified: rave/branches/angular/rave-portal-resources/src/main/resources/requireBuild.js
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/resources/requireBuild.js?rev=1506129&r1=1506128&r2=1506129&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/resources/requireBuild.js (original)
+++ rave/branches/angular/rave-portal-resources/src/main/resources/requireBuild.js Tue Jul 23 15:57:53 2013
@@ -22,25 +22,12 @@
mainConfigFile: '${basedir}/src/main/webapp/static/script/requireConfig.js',
baseUrl: '.',
dir: '${project.build.directory}/${project.build.finalName}/static/script-built',
+ paths: {
+ 'clientMessages': 'empty:'
+ },
modules: [
{
name: 'rave'
- },
- {
- name: 'ui',
- exclude: ['rave']
- },
- {
- name: 'portal/rave_admin',
- exclude: ['rave']
- },
- {
- name: 'portal/rave_store',
- exclude: ['rave']
- },
- {
- name: 'portal/rave_forms',
- exclude: ['rave']
}
]
-})
\ No newline at end of file
+})
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml?rev=1506129&r1=1506128&r2=1506129&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml Tue Jul 23 15:57:53 2013
@@ -21,11 +21,14 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/core"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxrs
- http://cxf.apache.org/schemas/jaxrs.xsd">
+ http://cxf.apache.org/schemas/jaxrs.xsd
+ http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd">
<!-- do not use import statements if CXFServlet init parameters link to this beans.xml -->
@@ -46,6 +49,12 @@
</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>
@@ -62,4 +71,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"/>
+
</beans>
\ No newline at end of file
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/requireConfig.js
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/requireConfig.js?rev=1506129&r1=1506128&r2=1506129&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/requireConfig.js (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/requireConfig.js Tue Jul 23 15:57:53 2013
@@ -21,9 +21,7 @@ requirejs.config({
"paths":{
"backbone":"//cdnjs.cloudflare.com/ajax/libs/backbone.js/0.9.10/backbone-min",
"bootstrap": '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.0.3/bootstrap.min',
- //The qs param ?a=b is a hack to force r.js optimizer to treat this as a network script, so it
- //won't try to bundle the resource
- "clientMessages": "../../app/messagebundle/rave_client_messages.js?a=b",
+ "clientMessages": "../../app/messagebundle/rave_client_messages",
"handlebars":"//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.0.rc.2/handlebars.min",
"jquery": "//ajax.aspnetcdn.com/ajax/jquery/jquery-1.7.2.min",
"jqueryUi":"//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/jquery-ui.min",
@@ -32,7 +30,6 @@ requirejs.config({
"jqueryTouchPouch": '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.2/jquery.ui.touch-punch.min',
"osapi":"//placeholder.url.will.be.replaced.by.opensocial.environment",
"rave": "core/main",
- "ui": "portal/main",
"underscore": "//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min"
},
shim: {
@@ -65,4 +62,4 @@ requirejs.config({
exports: '_'
}
}
-});
\ No newline at end of file
+});