You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/10/17 18:14:04 UTC
svn commit: r1533131 - in /cxf/branches/2.7.x-fixes: ./
rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/
Author: sergeyb
Date: Thu Oct 17 16:14:04 2013
New Revision: 1533131
URL: http://svn.apache.org/r1533131
Log:
Merged revisions 1533130 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1533130 | sergeyb | 2013-10-17 17:11:24 +0100 (Thu, 17 Oct 2013) | 1 line
[CXF-5331] Adding Serializable to Property and Permission
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Property.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1533130
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java?rev=1533131&r1=1533130&r2=1533131&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java Thu Oct 17 16:14:04 2013
@@ -18,11 +18,14 @@
*/
package org.apache.cxf.rs.security.oauth2.common;
+import java.io.Serializable;
+
/**
* Base permission description
* @see OAuthAuthorizationData
*/
-public class Permission {
+public class Permission implements Serializable {
+ private static final long serialVersionUID = 8988574955042726083L;
private String permission;
private String description;
private boolean isDefault;
Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Property.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Property.java?rev=1533131&r1=1533130&r2=1533131&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Property.java (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Property.java Thu Oct 17 16:14:04 2013
@@ -18,9 +18,11 @@
*/
package org.apache.cxf.rs.security.oauth2.common;
+import java.io.Serializable;
-public class Property {
+public class Property implements Serializable {
+ private static final long serialVersionUID = 7497703188917013732L;
private String name;
private String value;