You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/08/30 19:59:49 UTC
svn commit: r1519035 - in /cxf/branches/2.7.x-fixes/rt:
frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/
rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/
ws/security/src/main/java/org/apache/cxf/...
Author: dkulp
Date: Fri Aug 30 17:59:49 2013
New Revision: 1519035
URL: http://svn.apache.org/r1519035
Log:
Fix some eclipse warnings
Modified:
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=1519035&r1=1519034&r2=1519035&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Fri Aug 30 17:59:49 2013
@@ -672,11 +672,7 @@ public class JAXRSUtilsTest extends Asse
private static List<MediaType> sortMediaTypes(String mediaTypes) {
return JAXRSUtils.sortMediaTypes(mediaTypes, JAXRSUtils.MEDIA_TYPE_Q_PARAM);
}
-
- private static List<MediaType> sortMediaTypes(List<MediaType> mediaTypes) {
- return JAXRSUtils.sortMediaTypes(mediaTypes, JAXRSUtils.MEDIA_TYPE_Q_PARAM);
- }
-
+
private static int compareSortedMediaTypes(List<MediaType> mt1, List<MediaType> mt2) {
return JAXRSUtils.compareSortedMediaTypes(mt1, mt2, JAXRSUtils.MEDIA_TYPE_Q_PARAM);
}
Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java?rev=1519035&r1=1519034&r2=1519035&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java Fri Aug 30 17:59:49 2013
@@ -24,6 +24,8 @@ import org.apache.cxf.rs.security.oauth2
import org.apache.cxf.rs.security.saml.assertion.Claims;
public class SamlUserSubject extends UserSubject {
+ private static final long serialVersionUID = 1L;
+
private Claims claims;
public SamlUserSubject(String user,
List<String> roles,
Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java?rev=1519035&r1=1519034&r2=1519035&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java (original)
+++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java Fri Aug 30 17:59:49 2013
@@ -61,7 +61,6 @@ public class EHCacheTokenStore implement
cacheManager = EHCacheManagerHolder.getCacheManager(bus, configFileURL);
// Cannot overflow to disk as SecurityToken Elements can't be serialized
- @SuppressWarnings("deprecation")
CacheConfiguration cc = EHCacheManagerHolder.getCacheConfiguration(key, cacheManager)
.overflowToDisk(false); //tokens not writable