Author: veithen
Date: Tue Apr 18 22:16:20 2017
New Revision: 1791842
URL: http://svn.apache.org/viewvc?rev=1791842&view=rev
Log:
RAMPART-440: Upgrade OpenSAML.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RampartSAMLBootstrap.java
axis/axis2/java/rampart/trunk/pom.xml
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RampartSAMLBootstrap.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RampartSAMLBootstrap.java?rev=1791842&r1=1791841&r2=1791842&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RampartSAMLBootstrap.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RampartSAMLBootstrap.java
Tue Apr 18 22:16:20 2017
@@ -30,43 +30,6 @@ import org.opensaml.xml.parse.XMLParserE
* axiom specific one.
*/
public class RampartSAMLBootstrap extends DefaultBootstrap {
-
- /** List of default XMLTooling configuration files. */
- private static String[] xmlToolingConfigs = {
- "/default-config.xml",
- "/schema-config.xml",
- "/signature-config.xml",
- "/signature-validation-config.xml",
- "/encryption-config.xml",
- "/encryption-validation-config.xml",
- "/soap11-config.xml",
- "/wsfed11-protocol-config.xml",
- "/saml1-assertion-config.xml",
- "/saml1-protocol-config.xml",
- "/saml1-core-validation-config.xml",
- "/saml2-assertion-config.xml",
- "/saml2-protocol-config.xml",
- "/saml2-core-validation-config.xml",
- "/saml1-metadata-config.xml",
- "/saml2-metadata-config.xml",
- "/saml2-metadata-validation-config.xml",
- "/saml2-metadata-attr-config.xml",
- "/saml2-metadata-idp-discovery-config.xml",
- "/saml2-metadata-ui-config.xml",
- "/saml2-protocol-thirdparty-config.xml",
- "/saml2-metadata-query-config.xml",
- "/saml2-assertion-delegation-restriction-config.xml",
- "/saml2-ecp-config.xml",
- "/xacml10-saml2-profile-config.xml",
- "/xacml11-saml2-profile-config.xml",
- "/xacml20-context-config.xml",
- "/xacml20-policy-config.xml",
- "/xacml2-saml2-profile-config.xml",
- "/xacml3-saml2-profile-config.xml",
- "/wsaddressing-config.xml",
- "/wssecurity-config.xml",
- };
-
protected RampartSAMLBootstrap() {
super();
}
@@ -74,9 +37,7 @@ public class RampartSAMLBootstrap extend
public static synchronized void bootstrap() throws ConfigurationException {
initializeXMLSecurity();
- initializeVelocity();
-
- initializeXMLTooling(xmlToolingConfigs);
+ initializeXMLTooling();
initializeArtifactBuilderFactories();
@@ -85,6 +46,8 @@ public class RampartSAMLBootstrap extend
initializeParserPool();
initializeESAPI();
+
+ initializeHttpClient();
}
protected static void initializeParserPool() throws ConfigurationException
{
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1791842&r1=1791841&r2=1791842&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Tue Apr 18 22:16:20 2017
@@ -617,7 +617,7 @@
<axiom.version>1.3.0-SNAPSHOT</axiom.version>
<wss4j.version>1.6.19</wss4j.version>
- <opensaml.version>2.5.1-1</opensaml.version>
+ <opensaml.version>2.6.4</opensaml.version>
<bcprov.jdk15.version>1.49</bcprov.jdk15.version>
