You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2016/05/17 10:06:41 UTC
svn commit: r1744240 - in
/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common:
cache/EHCacheReplayCache.java saml/OpenSAMLBootstrap.java util/Loader.java
Author: coheigea
Date: Tue May 17 10:06:40 2016
New Revision: 1744240
URL: http://svn.apache.org/viewvc?rev=1744240&view=rev
Log:
More backwards compat work
Modified:
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java?rev=1744240&r1=1744239&r2=1744240&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java Tue May 17 10:06:40 2016
@@ -39,8 +39,8 @@ public class EHCacheReplayCache implemen
public static final long MAX_TTL = DEFAULT_TTL * 12L;
protected Ehcache cache;
protected CacheManager cacheManager;
- private long ttl = DEFAULT_TTL;
-
+ protected long ttl = DEFAULT_TTL;
+
public EHCacheReplayCache(String key, URL configFileURL) {
this(key, EHCacheManagerHolder.getCacheManager("", configFileURL));
}
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java?rev=1744240&r1=1744239&r2=1744240&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java Tue May 17 10:06:40 2016
@@ -36,7 +36,7 @@ import org.opensaml.xml.parse.XMLParserE
* This class intializes the Opensaml library. It is necessary to override DefaultBootstrap
* to avoid instantiating Velocity, which we do not need in WSS4J.
*/
-public final class OpenSAMLBootstrap extends DefaultBootstrap {
+public class OpenSAMLBootstrap extends DefaultBootstrap {
/** List of default XMLTooling configuration files. */
private static final String[] xmlToolingConfigs = {
@@ -74,11 +74,7 @@ public final class OpenSAMLBootstrap ext
"/wsaddressing-config.xml",
"/wssecurity-config.xml",
};
-
- private OpenSAMLBootstrap() {
- // complete
- }
-
+
/**
* Initializes the OpenSAML library, loading default configurations.
*
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java?rev=1744240&r1=1744239&r2=1744240&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java Tue May 17 10:06:40 2016
@@ -30,14 +30,10 @@ import java.security.PrivilegedAction;
* Load resources (or images) from various sources.
* <p/>
*/
-public final class Loader {
+public class Loader {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Loader.class);
- private Loader() {
- // complete
- }
-
/**
* This method will search for <code>resource</code> in different
* places. The search order is as follows: