Author: mfranklin
Date: Mon Apr 1 19:27:38 2013
New Revision: 1463263
URL: http://svn.apache.org/r1463263
Log:
fixed JSON marshalling of preferences
Removed:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/marshall/
Modified:
rave/trunk/pom.xml
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PageUser.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/RegionWidget.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1463263&r1=1463262&r2=1463263&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Mon Apr 1 19:27:38 2013
@@ -599,6 +599,16 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PageUser.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PageUser.java?rev=1463263&r1=1463262&r2=1463263&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PageUser.java
(original)
+++
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PageUser.java
Mon Apr 1 19:27:38 2013
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.*;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "PageUser", propOrder = {
- "editor", "personId"
+ "editor", "status","personId"
})
@XmlRootElement(name = "PageUser")
public class PageUser {
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/RegionWidget.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/RegionWidget.java?rev=1463263&r1=1463262&r2=1463263&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/RegionWidget.java
(original)
+++
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/RegionWidget.java
Mon Apr 1 19:27:38 2013
@@ -20,17 +20,14 @@
package org.apache.rave.rest.model;
import org.apache.rave.model.RegionWidgetPreference;
-import org.apache.rave.rest.model.marshall.XmlMapAdapter;
import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RegionWidget", propOrder = {
- "id", "type", "widgetId", "widgetUrl", "regionId", "collapsed",
"locked", "hideChrome", "userPrefs"
+ "id", "type", "widgetId", "widgetUrl", "regionId", "collapsed",
"locked", "hideChrome", "ownerId", "userPrefs"
})
@XmlRootElement(name = "RegionWidget")
public class RegionWidget {
@@ -54,8 +51,7 @@ public class RegionWidget {
@XmlElement(name = "ownerId")
protected String ownerId;
@XmlElement(name = "userPrefs")
- @XmlJavaTypeAdapter(value = XmlMapAdapter.class)
- protected Map<String, String> userPrefs;
+ protected HashMap<String, String> userPrefs;
public RegionWidget() { }
@@ -134,11 +130,11 @@ public class RegionWidget {
this.hideChrome = hideChrome;
}
- public Map<String, String> getUserPrefs() {
+ public HashMap<String, String> getUserPrefs() {
return userPrefs;
}
- public void setUserPrefs(Map<String, String> userPrefs) {
+ public void setUserPrefs(HashMap<String, String> userPrefs) {
this.userPrefs = userPrefs;
}
@@ -150,8 +146,8 @@ public class RegionWidget {
this.ownerId = ownerId;
}
- protected Map<String, String>
createPrefs(org.apache.rave.model.RegionWidget widget) {
- Map<String, String> created = null;
+ protected HashMap<String, String>
createPrefs(org.apache.rave.model.RegionWidget widget) {
+ HashMap<String, String> created = null;
List<RegionWidgetPreference> preferences = widget.getPreferences();
if(preferences != null) {
created = new HashMap<String, String>();
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java?rev=1463263&r1=1463262&r2=1463263&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
Mon Apr 1 19:27:38 2013
@@ -21,8 +21,13 @@ package org.apache.rave.provider.opensoc
import org.apache.rave.rest.model.RegionWidget;
+import javax.xml.bind.annotation.*;
+
+@XmlAccessorType(XmlAccessType.FIELD)
public class OpenSocialRegionWidget extends RegionWidget {
+ @XmlElement(name="securityToken")
protected String securityToken;
+ @XmlElement(name="metadata")
protected String metadata;
public OpenSocialRegionWidget() { }
