Author: lindner
Date: Tue Jan 27 20:40:36 2009
New Revision: 738233
URL: http://svn.apache.org/viewvc?rev=738233&view=rev
Log:
SHINDIG-892 | upgrade to oauth-core-20090121
Modified:
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=738233&r1=738232&r2=738233&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Tue Jan 27 20:40:36 2009
@@ -116,7 +116,7 @@
</dependency>
<dependency>
<groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
+ <artifactId>oauth-core</artifactId>
</dependency>
<dependency>
<groupId>com.google.collections</groupId>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=738233&r1=738232&r2=738233&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Tue Jan 27 20:40:36 2009
@@ -101,7 +101,7 @@
</dependency>
<dependency>
<groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
+ <artifactId>oauth-core</artifactId>
</dependency>
<!-- may only be needed for JDK < 1.6 -->
<dependency>
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java?rev=738233&r1=738232&r2=738233&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
Tue Jan 27 20:40:36 2009
@@ -155,7 +155,12 @@
try {
Object val = getter.method.invoke(pojo, EMPTY_OBJECT);
if (val != null) {
- toReturn.put(getter.fieldName, translateObjectToJson(val));
+ String attribute = getter.fieldName;
+ Object value = translateObjectToJson(val);
+
+ if (!(attribute.equals("isOwner") || attribute.equals("isViewer") &&
value.equals(Boolean.FALSE))) {
+ toReturn.put(attribute, value);
+ }
}
} catch (JSONException e) {
throw new RuntimeException(errorMessage(pojo, getter), e);
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=738233&r1=738232&r2=738233&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Tue Jan 27 20:40:36 2009
@@ -1222,8 +1222,8 @@
</dependency>
<dependency>
<groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
- <version>20080621</version>
+ <artifactId>oauth-core</artifactId>
+ <version>20090121</version>
<scope>compile</scope>
</dependency>
<dependency>
