[java-shib-metadata] branch main updated: Convert first set of Spring metadata tests to Embedded Jetty.
Codeberg
noreply at shibboleth.net
Mon Jul 13 19:49:28 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
https://codeberg.org/Shibboleth/java-shib-metadata/commit/d97949b96691fe0bb4b4b6c7ee2f71947665db2b
The following commit(s) were added to refs/heads/main by this push:
new d97949b9 Convert first set of Spring metadata tests to Embedded Jetty.
d97949b9 is described below
commit d97949b96691fe0bb4b4b6c7ee2f71947665db2b
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Mon Jul 13 15:49:15 2026 -0400
Convert first set of Spring metadata tests to Embedded Jetty.
---
.../http/HTTPResourceConfigurationTests.java | 26 +++-
.../FileBackedHTTPMetadataProviderParserTest.java | 154 +++++++++++----------
.../spring/metadata/beans-httpClientSecParams.xml | 61 ++++----
.../spring/metadata/fileBackedHTTPEntities.xml | 2 +-
.../spring/metadata/fileBackedHTTPEntity.xml | 2 +-
.../metadata/fileBackedHTTPEntityBadIFBF.xml | 2 +-
.../fileBackedHTTPEntityDisRegardTLSBad.xml | 2 +-
...-params.xml => http-client-security-params.xml} | 4 +-
.../spring/metadata/http-entities-client.xml | 2 +-
.../metadata/http-entity-httpCaching-file.xml | 2 +-
.../metadata/http-entity-httpCaching-memory.xml | 2 +-
.../metadata/http-entity-httpCaching-none.xml | 2 +-
.../net/shibboleth/spring/metadata/http-proxy.xml | 2 +-
.../shibboleth/spring/metadata/https-indexes.xml | 63 ++++-----
.../spring/metadata/https-noTrustEngine.xml | 2 +-
.../shibboleth/spring/metadata/https-timeouts.xml | 63 ++++-----
.../https-trustEngine-explicitKey-params-merge.xml | 63 ++++-----
...Engine-explicitKey-params-ref-same-document.xml | 63 ++++-----
.../https-trustEngine-explicitKey-params-ref.xml | 2 +-
.../metadata/https-trustEngine-explicitKey.xml | 63 ++++-----
.../metadata/https-trustEngine-invalidKey.xml | 2 +-
.../metadata/https-trustEngine-invalidPKIX.xml | 2 +-
...s-trustEngine-validPKIX-explicitTrustedName.xml | 61 ++++----
.../metadata/https-trustEngine-validPKIX.xml | 59 ++++----
24 files changed, 325 insertions(+), 381 deletions(-)
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
index c03bc06b..b304283c 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
@@ -16,6 +16,8 @@ package net.shibboleth.spring.http;
import java.io.File;
import java.io.IOException;
+import java.net.SocketException;
+import java.net.UnknownHostException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -25,15 +27,18 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.mock.env.MockPropertySource;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
import net.shibboleth.shared.annotation.constraint.NonnullBeforeTest;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.shared.testing.RepositorySupport;
+import net.shibboleth.shared.testing.EmbeddedJetty;
import net.shibboleth.shared.testing.ResourceTestHelper;
/**
@@ -49,6 +54,8 @@ public class HTTPResourceConfigurationTests {
@Nonnull private static final String DOC_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/document.xml";
+ @NonnullBeforeTest private EmbeddedJetty jetty;
+
@NonnullBeforeTest private File theDir = null;
@NonnullBeforeTest private GenericApplicationContext theContext = null;
@NonnullBeforeTest private GenericApplicationContext globalContext = null;
@@ -59,7 +66,7 @@ public class HTTPResourceConfigurationTests {
final ApplicationContextBuilder globalBuilder = new ApplicationContextBuilder();
final MockPropertySource propSource = new MockPropertySource("localProperties");
- propSource.setProperty(PROP_RESOURCE_URL, RepositorySupport.buildHTTPResourceURL(REPO_IDP, DOC_XML, false));
+ propSource.setProperty(PROP_RESOURCE_URL, "http://localhost:8080/document.xml");
globalBuilder.setPropertySources(CollectionSupport.singletonList(propSource));
//globalBuilder.setServiceConfiguration(new ClassPathResource("net/shibboleth/spring/http/parent.xml"));
globalContext = globalBuilder.build();
@@ -83,6 +90,21 @@ public class HTTPResourceConfigurationTests {
}
}
+ @BeforeClass
+ public void startJetty() throws UnknownHostException, SocketException {
+ jetty = new EmbeddedJetty();
+ jetty.startServer(new EmbeddedJetty.ResourceHandler(200,
+ ResourceHelper.of(new ClassPathResource("net/shibboleth/spring/http/document.xml"))));
+ }
+
+ @AfterClass
+ public void stopJetty() {
+ if (jetty != null) {
+ jetty.stopServer();
+ jetty = null;
+ }
+ }
+
private void emptyDir(final File dir) {
for (final File f : dir.listFiles()) {
if (f.isDirectory()) {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
index 3be3aaa5..f5dd0cc4 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
@@ -16,40 +16,81 @@ package net.shibboleth.spring.metadata;
import static org.testng.Assert.*;
+import java.net.SocketException;
+import java.net.UnknownHostException;
import java.time.Duration;
import java.util.Iterator;
import java.util.List;
+import javax.annotation.Nonnull;
+
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.FileBackedHTTPMetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolver;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.security.httpclient.HttpClientSecurityParameters;
import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.mock.env.MockPropertySource;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.test.util.ReflectionTestUtils;
import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.shared.testing.RepositorySupport;
+import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.resource.Resource;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
+import net.shibboleth.shared.testing.EmbeddedJetty;
@SuppressWarnings("javadoc")
public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
- private static final String PROP_MDURL = "metadataURL";
+ private EmbeddedJetty jetty;
+ private int jettyStatus;
+ private Resource jettyResource;
+ private Resource entityResource;
+ private Resource entitiesResource;
- private static final String REPO_IDP = "java-shib-metadata";
-
- private static final String ENTITY_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/entity.xml";
+ @BeforeClass
+ public void startJetty() throws UnknownHostException, SocketException {
+ entityResource = ResourceHelper.of(new ClassPathResource("net/shibboleth/spring/metadata/entity.xml"));
+ entitiesResource = ResourceHelper.of(new ClassPathResource("net/shibboleth/spring/metadata/entities.xml"));
+
+ jettyStatus = 200;
+
+ jetty = new EmbeddedJetty();
+ jetty.startServer(new EmbeddedJetty.ResourceHandler(
+ new NonnullSupplier<Integer>() {
+ @Nonnull public Integer get() {
+ return jettyStatus;
+ }
+ },
+ new NonnullSupplier<Resource>() {
+ @Nonnull public Resource get() {
+ return jettyResource;
+ }
+ }));
+ }
+
+ @AfterClass
+ public void stopJetty() {
+ if (jetty != null) {
+ jetty.stopServer();
+ jetty = null;
+ }
+ }
+
+ @BeforeMethod
+ public void resetResource() {
+ // Most tests assume the single entity resource.
+ jettyResource = entityResource;
+ }
- private static final String ENTITIES_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/entities.xml";
-
@Test public void entity() throws Exception {
- final MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
final FileBackedHTTPMetadataResolver resolver =
- getBean(FileBackedHTTPMetadataResolver.class, propSource, "fileBackedHTTPEntity.xml", "beans.xml");
+ getBean(FileBackedHTTPMetadataResolver.class, "fileBackedHTTPEntity.xml", "beans.xml");
assert resolver != null;
assertEquals(resolver.getId(), "fileBackedHTTPEntity");
@@ -77,11 +118,9 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test(expectedExceptions = {BeanCreationException.class}) public void badIFBVF() throws Exception {
- final MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
final FileBackedHTTPMetadataResolver resolver =
- getBean(FileBackedHTTPMetadataResolver.class, propSource, "fileBackedHTTPEntityBadIFBF.xml", "beans.xml");
+ getBean(FileBackedHTTPMetadataResolver.class, "fileBackedHTTPEntityBadIFBF.xml", "beans.xml");
assert resolver != null;
assertEquals(resolver.getId(), "BadIFBF");
@@ -109,11 +148,9 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
@Test(expectedExceptions = {BeanCreationException.class}) public void badTLS() throws Exception {
- final MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
final FileBackedHTTPMetadataResolver resolver =
- getBean(FileBackedHTTPMetadataResolver.class, propSource, "fileBackedHTTPEntityDisRegardTLSBad.xml", "beans.xml");
+ getBean(FileBackedHTTPMetadataResolver.class, "fileBackedHTTPEntityDisRegardTLSBad.xml", "beans.xml");
assertEquals(resolver.getId(), "badTLS");
@@ -141,11 +178,10 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
@Test public void entities() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITIES_XML, false));
-
+ jettyResource = entitiesResource;
+
final MetadataResolver resolver =
- getBean(FileBackedHTTPMetadataResolver.class, propSource, "fileBackedHTTPEntities.xml", "beans.xml");
+ getBean(FileBackedHTTPMetadataResolver.class, "fileBackedHTTPEntities.xml", "beans.xml");
assertEquals(resolver.getId(), "fileBackedHTTPEntities");
@@ -154,10 +190,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test(enabled=false) public void httpsNoTrustEngine() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-noTrustEngine.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-noTrustEngine.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -165,10 +199,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpsTrustEngineExplicitKey() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-explicitKey.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-explicitKey.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -176,10 +208,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpsTrustEngineExplicitKeyViaParamsRef() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-explicitKey-params-ref.xml", "beans.xml", "beans-httpClientSecParams.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-explicitKey-params-ref.xml", "beans.xml", "beans-httpClientSecParams.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -187,10 +217,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpsTrustEngineExplicitKeyViaParamsRefSameDocument() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-explicitKey-params-ref-same-document.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-explicitKey-params-ref-same-document.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -198,10 +226,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpsTrustEngineExplicitKeyParamsMerge() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-explicitKey-params-merge.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-explicitKey-params-merge.xml", "beans.xml");
//Test the merged security params instance
assert resolver != null;
@@ -222,10 +248,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test(expectedExceptions=BeanCreationException.class) public void httpsTrustEngineInvalidKey() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-invalidKey.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-invalidKey.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -233,10 +257,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpsTrustEngineValidPKIX() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-validPKIX.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-validPKIX.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -244,10 +266,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpsTrustEngineValidPKIXExplicitTrustedName() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-validPKIX-explicitTrustedName.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-validPKIX-explicitTrustedName.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -255,10 +275,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test(expectedExceptions=BeanCreationException.class) public void httpsTrustEngineInvalidPKIX() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-trustEngine-invalidPKIX.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-trustEngine-invalidPKIX.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntity");
@@ -268,22 +286,19 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
/**
* Test the proxy parameters. This will throw an exception because we do not
* have a proxy to test against. It is here to allow hand walking of the code during
- * development and as a placeholder against when we get a proxy gost.
+ * development and as a placeholder against if we get a proxy host.
*
* @throws Exception if something goes wrong
*/
@Test(expectedExceptions={BeanCreationException.class,}, enabled=false) public void proxy() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
- getBean(HTTPMetadataResolver.class, propSource, "HTTPProxy.xml", "beans.xml");
+ getBean(HTTPMetadataResolver.class, "http-proxy.xml", "beans.xml");
}
@Test public void httpClient() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITIES_XML, false));
-
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entities-client.xml", "beans.xml", "httpClient.xml");
+ jettyResource = entitiesResource;
+
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "http-entities-client.xml", "beans.xml", "httpClient.xml");
assertEquals(resolver.getId(), "HTTPEntities");
assertNotNull(resolver.resolveSingle(criteriaFor(SP_ID)));
@@ -293,10 +308,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpCachingNone() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entity-httpCaching-none.xml", "beans.xml", "httpClient.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "http-entity-httpCaching-none.xml", "beans.xml", "httpClient.xml");
assertEquals(resolver.getId(), "HTTPEntity");
assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
@@ -304,10 +317,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void httpCachingMemory() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entity-httpCaching-memory.xml", "beans.xml", "httpClient.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "http-entity-httpCaching-memory.xml", "beans.xml", "httpClient.xml");
assertEquals(resolver.getId(), "HTTPEntity");
assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
@@ -317,10 +328,7 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
@Test public void httpCachingFile() throws Exception {
System.out.println(System.getProperty("java.io.tmpdir"));
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
-
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entity-httpCaching-file.xml", "beans.xml", "httpClient.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "http-entity-httpCaching-file.xml", "beans.xml", "httpClient.xml");
assertEquals(resolver.getId(), "HTTPEntity");
assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
@@ -328,10 +336,8 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void timeouts() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-timeouts.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-timeouts.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntityWithTimeouts");
@@ -339,21 +345,17 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
}
@Test public void clientSecurityParameters() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-client-security-params.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "http-client-security-params.xml", "beans.xml");
- assertEquals(resolver.getId(), "HTTPSEntityWithClientSecurityParams");
+ assertEquals(resolver.getId(), "HTTPEntityWithClientSecurityParams");
assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
}
@Test public void indexes() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "https-indexes.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-indexes.xml", "beans.xml");
assertEquals(resolver.getId(), "HTTPSEntityWithIndexes");
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml
index cbbf8a9a..5c6fedd3 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml
@@ -17,42 +17,31 @@
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
<security:Credential xsi:type="security:X509Inline">
<security:Certificate>
-<!-- The projects LLSS cert -->
-MIIGazCCBFOgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwaTELMAkGA1UEBhMCVVMx
-DTALBgNVBAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEr
-MCkGA1UEAwwiU2hpYmJvbGV0aCBQcm9qZWN0IEludGVybWVkaWF0ZSBDQTAeFw0x
-ODEyMTExNTE5NDlaFw0zODEyMDYxNTE5NDlaMFoxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xHDAaBgNV
-BAMME3Rlc3Quc2hpYmJvbGV0aC5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDI39TBFEbOkf0Bb2h/qnG4bbJRF5Ga9OBgSAxPsx2PNgVmf1cvJYlq
-uRCzATu3O4PPclomow5VU7hB+umpk2s03FHejUtO8w85qQx7bkSeyfLpMYloX3SD
-AWDFSpw54Tg2Dfja6jYLnE0aYWUCTXjcFJEIrT0QP1Azdk8b9PeKLqGIagECUMzC
-UjmJxEcyqhbe6mB7tdSsBng+R4DRdVdouN4rtHknNuEyAc5eEppGxY33KXhElYol
-4IK6YxAqXI6iQIDdcVxrH061/iKh7qT1bCAEmzeeoS4st4v4oyIhxUk7yUxYOuFc
-NhYUd5U93Ws4P8xPFzcPhD2TIZDAS/bnm2EJ+JxLG6Gp1jhBN5qTpdTPWiG9+Tmm
-HFuYOrSefgZk0edkJhe0dycfV/FWFX2fNrmkpQhyPQzb3ZyZ5mACn020TXDaF5o3
-fX8ndLl4RghTORJs5n51TuLX85DEeZWkJe5f8Hsip1mpmxlMTl9QMqHrN70n5gBi
-uCYo9g/Jw5xoropCq7Jri9K9FWtbORncUIXutsTVo+fXeHZ6IDRoovR004gHHEJ7
-ks46fZQYNbd8bB/mPlCdYiFyJnfUiOu89O5aLqvhrJNgPUhMt/gmhSV7zw+/3/cd
-o7pwWH2h2ObuS8v8gVUZAE04tefqRJZEB0YsWA3DASDT7nVqndOp2QIDAQABo4IB
-KjCCASYwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwMwYJYIZIAYb4QgEN
-BCYWJE9wZW5TU0wgR2VuZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-FgQUG3Vg4ubsJVaylBUCPtqVc9mHWfYwgYwGA1UdIwSBhDCBgYAUELzfpij2mkrs
-9B4CEsXYmoN6cKuhZaRjMGExCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4w
-HAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xIzAhBgNVBAMMGlNoaWJib2xl
-dGggUHJvamVjdCBUZXN0IENBggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIBAFZQF7KzKGSPieV2eQWbFt30
-kVZzVe/T5UAvrr8n7mRqMfye4QtHHOVM3MHvZv93AXVUQU4PH9KPGtv7poEtwNWk
-7hNbq74z5x5tSvE0EYYI9UMolDL6il+QR5AgLw7YqgMmPPhtm+crmLg8+uMoQDyU
-uSH8ej4rMrdhL2xKlgvL/rhWycpYu1cFLmeolljOZGqr7ITwWJ06BQsLtt4/cyYj
-WiVldHQRZMGAuHLHlX+ukaEg7Gc/N7o936bS5d7AqXwtmtkXiA8An5q5rhncEK1G
-kwUUQN2y5iyx/nD4B2k1IcgFlu/bM4iXZQtmMUtLptUqRssuxS45ukiweiM9UU8n
-WxyxJMzFTctJJ2f/y4Bg5ggsr4WQU/YhoDaQVYxyjXiBt3oT+7eqsoep9HK9xwbG
-xriLzrlao+K3EcKA3vjKGYh15gpEDUbn0Cr5V74TUSdkHjhG7ocaJ5u9/vCS4+AR
-iU5ge2zN6QcwoZKT8+8XGKeXqVc/3hXeXTn3FyvMitPDZsmg8wUhnb/pq5MyKqUA
-bNse4a7oGAeAUGkLf4Q+eLCLSZmL5udrGXdHIffFYqZVcZS+zVWQ1TRfodTDPkFb
-KTz1mcr4KjLNCtplu4CfFpHwC20uk3hPEslOUd+ugj0+HGNH93L7H0WL1GDQoCPh
-RcdRISVwORcD/dit15zD
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:Credential>
</security:TrustEngine>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntities.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntities.xml
index 05098fb1..75bce485 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntities.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntities.xml
@@ -6,7 +6,7 @@
id="fileBackedHTTPEntities" xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolFileEntities.xml"
- metadataURL="%{metadataURL}"
+ metadataURL="http://localhost:8080/entities.xml"
metricsBaseName="fileBackedHTTPEntities">
</metadata:MetadataProvider>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntity.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntity.xml
index 6f269210..61c2a6f0 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntity.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntity.xml
@@ -9,7 +9,7 @@
initializeFromBackupFile="false"
backupFileInitNextRefreshDelay="PT10S"
expirationWarningThreshold="PT12H"
- metadataURL="%{metadataURL}">
+ metadataURL="http://localhost:8080/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityBadIFBF.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityBadIFBF.xml
index 493875b9..13e00afd 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityBadIFBF.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityBadIFBF.xml
@@ -9,7 +9,7 @@
initializeFromBackupFile=" "
backupFileInitNextRefreshDelay="PT10S"
expirationWarningThreshold="PT12H"
- metadataURL="%{metadataURL}">
+ metadataURL="http://localhost:8080/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityDisRegardTLSBad.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityDisRegardTLSBad.xml
index 1648f0d8..874fa067 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityDisRegardTLSBad.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/fileBackedHTTPEntityDisRegardTLSBad.xml
@@ -10,7 +10,7 @@
backupFileInitNextRefreshDelay="PT10S"
expirationWarningThreshold="PT12H"
disregardTLSCertificate=" "
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-client-security-params.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-client-security-params.xml
similarity index 90%
rename from shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-client-security-params.xml
rename to shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-client-security-params.xml
index 87da807f..5c77390b 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-client-security-params.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-client-security-params.xml
@@ -7,9 +7,9 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- id="HTTPSEntityWithClientSecurityParams"
+ id="HTTPEntityWithClientSecurityParams"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
- metadataURL="%{metadataURL}"
+ metadataURL="http://localhost:8080/entity.xml"
backingFile="%{DIR}/spoolClientSecurityParams.xml"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entities-client.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entities-client.xml
index c239d7dc..725f0295 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entities-client.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entities-client.xml
@@ -8,7 +8,7 @@
id="HTTPEntities" xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpentitiesClient.xml"
httpClientRef="apacheClient"
- metadataURL="%{metadataURL}"
+ metadataURL="http://localhost:8080/entities.xml"
metricsBaseName="HTTPEntities">
</metadata:MetadataProvider>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-file.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-file.xml
index 51bd8953..56e4adad 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-file.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-file.xml
@@ -8,7 +8,7 @@
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpentitycaching-file.xml"
httpClientRef="fileClient"
- metadataURL="%{metadataURL}">
+ metadataURL="http://localhost:8080/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-memory.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-memory.xml
index 6d1f55f4..403f258b 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-memory.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-memory.xml
@@ -8,7 +8,7 @@
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpcaching-memory.xml"
httpClientRef="memClient"
- metadataURL="%{metadataURL}">
+ metadataURL="http://localhost:8080/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-none.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-none.xml
index e21b0017..70d81627 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-none.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-entity-httpCaching-none.xml
@@ -7,7 +7,7 @@
id="HTTPEntity"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpentitycaching none.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="http://localhost:8080/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-proxy.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-proxy.xml
index 75c02ea0..4d2515a1 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-proxy.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/http-proxy.xml
@@ -7,7 +7,7 @@
proxyHost="localhost" proxyUser="user" proxyPassword="pass" proxyPort="123"
id="HTTPProxy" xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpproxy.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-indexes.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-indexes.xml
index 3a9dd962..f772520d 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-indexes.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-indexes.xml
@@ -10,49 +10,38 @@
id="HTTPSEntityWithIndexes"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpsindexies.xml"
- metadataURL="%{metadataURL}"
+ metadataURL="https://localhost:8443/entity.xml"
indexesRef="metadata.Indexes"
>
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
<security:Credential xsi:type="security:X509Inline" id="shibboleth.net">
<security:Certificate>
-<!-- The project's LLSS cert -->
-MIIGazCCBFOgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwaTELMAkGA1UEBhMCVVMx
-DTALBgNVBAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEr
-MCkGA1UEAwwiU2hpYmJvbGV0aCBQcm9qZWN0IEludGVybWVkaWF0ZSBDQTAeFw0x
-ODEyMTExNTE5NDlaFw0zODEyMDYxNTE5NDlaMFoxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xHDAaBgNV
-BAMME3Rlc3Quc2hpYmJvbGV0aC5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDI39TBFEbOkf0Bb2h/qnG4bbJRF5Ga9OBgSAxPsx2PNgVmf1cvJYlq
-uRCzATu3O4PPclomow5VU7hB+umpk2s03FHejUtO8w85qQx7bkSeyfLpMYloX3SD
-AWDFSpw54Tg2Dfja6jYLnE0aYWUCTXjcFJEIrT0QP1Azdk8b9PeKLqGIagECUMzC
-UjmJxEcyqhbe6mB7tdSsBng+R4DRdVdouN4rtHknNuEyAc5eEppGxY33KXhElYol
-4IK6YxAqXI6iQIDdcVxrH061/iKh7qT1bCAEmzeeoS4st4v4oyIhxUk7yUxYOuFc
-NhYUd5U93Ws4P8xPFzcPhD2TIZDAS/bnm2EJ+JxLG6Gp1jhBN5qTpdTPWiG9+Tmm
-HFuYOrSefgZk0edkJhe0dycfV/FWFX2fNrmkpQhyPQzb3ZyZ5mACn020TXDaF5o3
-fX8ndLl4RghTORJs5n51TuLX85DEeZWkJe5f8Hsip1mpmxlMTl9QMqHrN70n5gBi
-uCYo9g/Jw5xoropCq7Jri9K9FWtbORncUIXutsTVo+fXeHZ6IDRoovR004gHHEJ7
-ks46fZQYNbd8bB/mPlCdYiFyJnfUiOu89O5aLqvhrJNgPUhMt/gmhSV7zw+/3/cd
-o7pwWH2h2ObuS8v8gVUZAE04tefqRJZEB0YsWA3DASDT7nVqndOp2QIDAQABo4IB
-KjCCASYwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwMwYJYIZIAYb4QgEN
-BCYWJE9wZW5TU0wgR2VuZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-FgQUG3Vg4ubsJVaylBUCPtqVc9mHWfYwgYwGA1UdIwSBhDCBgYAUELzfpij2mkrs
-9B4CEsXYmoN6cKuhZaRjMGExCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4w
-HAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xIzAhBgNVBAMMGlNoaWJib2xl
-dGggUHJvamVjdCBUZXN0IENBggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIBAFZQF7KzKGSPieV2eQWbFt30
-kVZzVe/T5UAvrr8n7mRqMfye4QtHHOVM3MHvZv93AXVUQU4PH9KPGtv7poEtwNWk
-7hNbq74z5x5tSvE0EYYI9UMolDL6il+QR5AgLw7YqgMmPPhtm+crmLg8+uMoQDyU
-uSH8ej4rMrdhL2xKlgvL/rhWycpYu1cFLmeolljOZGqr7ITwWJ06BQsLtt4/cyYj
-WiVldHQRZMGAuHLHlX+ukaEg7Gc/N7o936bS5d7AqXwtmtkXiA8An5q5rhncEK1G
-kwUUQN2y5iyx/nD4B2k1IcgFlu/bM4iXZQtmMUtLptUqRssuxS45ukiweiM9UU8n
-WxyxJMzFTctJJ2f/y4Bg5ggsr4WQU/YhoDaQVYxyjXiBt3oT+7eqsoep9HK9xwbG
-xriLzrlao+K3EcKA3vjKGYh15gpEDUbn0Cr5V74TUSdkHjhG7ocaJ5u9/vCS4+AR
-iU5ge2zN6QcwoZKT8+8XGKeXqVc/3hXeXTn3FyvMitPDZsmg8wUhnb/pq5MyKqUA
-bNse4a7oGAeAUGkLf4Q+eLCLSZmL5udrGXdHIffFYqZVcZS+zVWQ1TRfodTDPkFb
-KTz1mcr4KjLNCtplu4CfFpHwC20uk3hPEslOUd+ugj0+HGNH93L7H0WL1GDQoCPh
-RcdRISVwORcD/dit15zD
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:Credential>
</security:TrustEngine>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-noTrustEngine.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-noTrustEngine.xml
index 54e89607..09971a60 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-noTrustEngine.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-noTrustEngine.xml
@@ -9,7 +9,7 @@
id="HTTPSEntity" xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpsnotrustengine.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-timeouts.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-timeouts.xml
index b91584a1..de4fe564 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-timeouts.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-timeouts.xml
@@ -10,7 +10,7 @@
id="HTTPSEntityWithTimeouts"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpstimeouts.xml"
- metadataURL="%{metadataURL}"
+ metadataURL="https://localhost:8443/entity.xml"
connectionTimeout="PT2M30S"
connectionRequestTimeout="PT2M30S"
socketTimeout="PT2M30S"
@@ -19,42 +19,31 @@
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
<security:Credential xsi:type="security:X509Inline" id="shibboleth.net">
<security:Certificate>
-<!-- The projects LLSS cert -->
-MIIGazCCBFOgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwaTELMAkGA1UEBhMCVVMx
-DTALBgNVBAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEr
-MCkGA1UEAwwiU2hpYmJvbGV0aCBQcm9qZWN0IEludGVybWVkaWF0ZSBDQTAeFw0x
-ODEyMTExNTE5NDlaFw0zODEyMDYxNTE5NDlaMFoxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xHDAaBgNV
-BAMME3Rlc3Quc2hpYmJvbGV0aC5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDI39TBFEbOkf0Bb2h/qnG4bbJRF5Ga9OBgSAxPsx2PNgVmf1cvJYlq
-uRCzATu3O4PPclomow5VU7hB+umpk2s03FHejUtO8w85qQx7bkSeyfLpMYloX3SD
-AWDFSpw54Tg2Dfja6jYLnE0aYWUCTXjcFJEIrT0QP1Azdk8b9PeKLqGIagECUMzC
-UjmJxEcyqhbe6mB7tdSsBng+R4DRdVdouN4rtHknNuEyAc5eEppGxY33KXhElYol
-4IK6YxAqXI6iQIDdcVxrH061/iKh7qT1bCAEmzeeoS4st4v4oyIhxUk7yUxYOuFc
-NhYUd5U93Ws4P8xPFzcPhD2TIZDAS/bnm2EJ+JxLG6Gp1jhBN5qTpdTPWiG9+Tmm
-HFuYOrSefgZk0edkJhe0dycfV/FWFX2fNrmkpQhyPQzb3ZyZ5mACn020TXDaF5o3
-fX8ndLl4RghTORJs5n51TuLX85DEeZWkJe5f8Hsip1mpmxlMTl9QMqHrN70n5gBi
-uCYo9g/Jw5xoropCq7Jri9K9FWtbORncUIXutsTVo+fXeHZ6IDRoovR004gHHEJ7
-ks46fZQYNbd8bB/mPlCdYiFyJnfUiOu89O5aLqvhrJNgPUhMt/gmhSV7zw+/3/cd
-o7pwWH2h2ObuS8v8gVUZAE04tefqRJZEB0YsWA3DASDT7nVqndOp2QIDAQABo4IB
-KjCCASYwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwMwYJYIZIAYb4QgEN
-BCYWJE9wZW5TU0wgR2VuZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-FgQUG3Vg4ubsJVaylBUCPtqVc9mHWfYwgYwGA1UdIwSBhDCBgYAUELzfpij2mkrs
-9B4CEsXYmoN6cKuhZaRjMGExCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4w
-HAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xIzAhBgNVBAMMGlNoaWJib2xl
-dGggUHJvamVjdCBUZXN0IENBggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIBAFZQF7KzKGSPieV2eQWbFt30
-kVZzVe/T5UAvrr8n7mRqMfye4QtHHOVM3MHvZv93AXVUQU4PH9KPGtv7poEtwNWk
-7hNbq74z5x5tSvE0EYYI9UMolDL6il+QR5AgLw7YqgMmPPhtm+crmLg8+uMoQDyU
-uSH8ej4rMrdhL2xKlgvL/rhWycpYu1cFLmeolljOZGqr7ITwWJ06BQsLtt4/cyYj
-WiVldHQRZMGAuHLHlX+ukaEg7Gc/N7o936bS5d7AqXwtmtkXiA8An5q5rhncEK1G
-kwUUQN2y5iyx/nD4B2k1IcgFlu/bM4iXZQtmMUtLptUqRssuxS45ukiweiM9UU8n
-WxyxJMzFTctJJ2f/y4Bg5ggsr4WQU/YhoDaQVYxyjXiBt3oT+7eqsoep9HK9xwbG
-xriLzrlao+K3EcKA3vjKGYh15gpEDUbn0Cr5V74TUSdkHjhG7ocaJ5u9/vCS4+AR
-iU5ge2zN6QcwoZKT8+8XGKeXqVc/3hXeXTn3FyvMitPDZsmg8wUhnb/pq5MyKqUA
-bNse4a7oGAeAUGkLf4Q+eLCLSZmL5udrGXdHIffFYqZVcZS+zVWQ1TRfodTDPkFb
-KTz1mcr4KjLNCtplu4CfFpHwC20uk3hPEslOUd+ugj0+HGNH93L7H0WL1GDQoCPh
-RcdRISVwORcD/dit15zD
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:Credential>
</security:TrustEngine>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml
index 5ec47115..d4e0f8ab 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml
@@ -20,48 +20,37 @@
xsi:type="metadata:FileBackedHTTPMetadataProvider"
httpClientSecurityParametersRef="metadata.HttpClientSecurityParametersWithProtocols"
backingFile="%{DIR}/spoolhttpstrustengineexplicitkey-params-merge.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
<security:Credential xsi:type="security:X509Inline" id="shibboleth.net">
<security:Certificate>
-<!-- The projects LLSS cert -->
-MIIGazCCBFOgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwaTELMAkGA1UEBhMCVVMx
-DTALBgNVBAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEr
-MCkGA1UEAwwiU2hpYmJvbGV0aCBQcm9qZWN0IEludGVybWVkaWF0ZSBDQTAeFw0x
-ODEyMTExNTE5NDlaFw0zODEyMDYxNTE5NDlaMFoxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xHDAaBgNV
-BAMME3Rlc3Quc2hpYmJvbGV0aC5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDI39TBFEbOkf0Bb2h/qnG4bbJRF5Ga9OBgSAxPsx2PNgVmf1cvJYlq
-uRCzATu3O4PPclomow5VU7hB+umpk2s03FHejUtO8w85qQx7bkSeyfLpMYloX3SD
-AWDFSpw54Tg2Dfja6jYLnE0aYWUCTXjcFJEIrT0QP1Azdk8b9PeKLqGIagECUMzC
-UjmJxEcyqhbe6mB7tdSsBng+R4DRdVdouN4rtHknNuEyAc5eEppGxY33KXhElYol
-4IK6YxAqXI6iQIDdcVxrH061/iKh7qT1bCAEmzeeoS4st4v4oyIhxUk7yUxYOuFc
-NhYUd5U93Ws4P8xPFzcPhD2TIZDAS/bnm2EJ+JxLG6Gp1jhBN5qTpdTPWiG9+Tmm
-HFuYOrSefgZk0edkJhe0dycfV/FWFX2fNrmkpQhyPQzb3ZyZ5mACn020TXDaF5o3
-fX8ndLl4RghTORJs5n51TuLX85DEeZWkJe5f8Hsip1mpmxlMTl9QMqHrN70n5gBi
-uCYo9g/Jw5xoropCq7Jri9K9FWtbORncUIXutsTVo+fXeHZ6IDRoovR004gHHEJ7
-ks46fZQYNbd8bB/mPlCdYiFyJnfUiOu89O5aLqvhrJNgPUhMt/gmhSV7zw+/3/cd
-o7pwWH2h2ObuS8v8gVUZAE04tefqRJZEB0YsWA3DASDT7nVqndOp2QIDAQABo4IB
-KjCCASYwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwMwYJYIZIAYb4QgEN
-BCYWJE9wZW5TU0wgR2VuZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-FgQUG3Vg4ubsJVaylBUCPtqVc9mHWfYwgYwGA1UdIwSBhDCBgYAUELzfpij2mkrs
-9B4CEsXYmoN6cKuhZaRjMGExCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4w
-HAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xIzAhBgNVBAMMGlNoaWJib2xl
-dGggUHJvamVjdCBUZXN0IENBggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIBAFZQF7KzKGSPieV2eQWbFt30
-kVZzVe/T5UAvrr8n7mRqMfye4QtHHOVM3MHvZv93AXVUQU4PH9KPGtv7poEtwNWk
-7hNbq74z5x5tSvE0EYYI9UMolDL6il+QR5AgLw7YqgMmPPhtm+crmLg8+uMoQDyU
-uSH8ej4rMrdhL2xKlgvL/rhWycpYu1cFLmeolljOZGqr7ITwWJ06BQsLtt4/cyYj
-WiVldHQRZMGAuHLHlX+ukaEg7Gc/N7o936bS5d7AqXwtmtkXiA8An5q5rhncEK1G
-kwUUQN2y5iyx/nD4B2k1IcgFlu/bM4iXZQtmMUtLptUqRssuxS45ukiweiM9UU8n
-WxyxJMzFTctJJ2f/y4Bg5ggsr4WQU/YhoDaQVYxyjXiBt3oT+7eqsoep9HK9xwbG
-xriLzrlao+K3EcKA3vjKGYh15gpEDUbn0Cr5V74TUSdkHjhG7ocaJ5u9/vCS4+AR
-iU5ge2zN6QcwoZKT8+8XGKeXqVc/3hXeXTn3FyvMitPDZsmg8wUhnb/pq5MyKqUA
-bNse4a7oGAeAUGkLf4Q+eLCLSZmL5udrGXdHIffFYqZVcZS+zVWQ1TRfodTDPkFb
-KTz1mcr4KjLNCtplu4CfFpHwC20uk3hPEslOUd+ugj0+HGNH93L7H0WL1GDQoCPh
-RcdRISVwORcD/dit15zD
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:Credential>
</security:TrustEngine>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml
index 6f697c2f..4feba417 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml
@@ -20,7 +20,7 @@
xsi:type="metadata:FileBackedHTTPMetadataProvider"
httpClientSecurityParametersRef="metadata.HttpClientSecurityParametersWithTrustEngine"
backingFile="%{DIR}/spoolhttpstrustengineexplicitkeyviaparams-samedocument.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
</metadata:MetadataProvider>
<bean id="metadata.HttpClientSecurityParametersWithTrustEngine" destroy-method=""
@@ -29,42 +29,31 @@
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
<security:Credential xsi:type="security:X509Inline">
<security:Certificate>
-<!-- The projects LLSS cert -->
-MIIGazCCBFOgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwaTELMAkGA1UEBhMCVVMx
-DTALBgNVBAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEr
-MCkGA1UEAwwiU2hpYmJvbGV0aCBQcm9qZWN0IEludGVybWVkaWF0ZSBDQTAeFw0x
-ODEyMTExNTE5NDlaFw0zODEyMDYxNTE5NDlaMFoxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xHDAaBgNV
-BAMME3Rlc3Quc2hpYmJvbGV0aC5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDI39TBFEbOkf0Bb2h/qnG4bbJRF5Ga9OBgSAxPsx2PNgVmf1cvJYlq
-uRCzATu3O4PPclomow5VU7hB+umpk2s03FHejUtO8w85qQx7bkSeyfLpMYloX3SD
-AWDFSpw54Tg2Dfja6jYLnE0aYWUCTXjcFJEIrT0QP1Azdk8b9PeKLqGIagECUMzC
-UjmJxEcyqhbe6mB7tdSsBng+R4DRdVdouN4rtHknNuEyAc5eEppGxY33KXhElYol
-4IK6YxAqXI6iQIDdcVxrH061/iKh7qT1bCAEmzeeoS4st4v4oyIhxUk7yUxYOuFc
-NhYUd5U93Ws4P8xPFzcPhD2TIZDAS/bnm2EJ+JxLG6Gp1jhBN5qTpdTPWiG9+Tmm
-HFuYOrSefgZk0edkJhe0dycfV/FWFX2fNrmkpQhyPQzb3ZyZ5mACn020TXDaF5o3
-fX8ndLl4RghTORJs5n51TuLX85DEeZWkJe5f8Hsip1mpmxlMTl9QMqHrN70n5gBi
-uCYo9g/Jw5xoropCq7Jri9K9FWtbORncUIXutsTVo+fXeHZ6IDRoovR004gHHEJ7
-ks46fZQYNbd8bB/mPlCdYiFyJnfUiOu89O5aLqvhrJNgPUhMt/gmhSV7zw+/3/cd
-o7pwWH2h2ObuS8v8gVUZAE04tefqRJZEB0YsWA3DASDT7nVqndOp2QIDAQABo4IB
-KjCCASYwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwMwYJYIZIAYb4QgEN
-BCYWJE9wZW5TU0wgR2VuZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-FgQUG3Vg4ubsJVaylBUCPtqVc9mHWfYwgYwGA1UdIwSBhDCBgYAUELzfpij2mkrs
-9B4CEsXYmoN6cKuhZaRjMGExCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4w
-HAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xIzAhBgNVBAMMGlNoaWJib2xl
-dGggUHJvamVjdCBUZXN0IENBggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIBAFZQF7KzKGSPieV2eQWbFt30
-kVZzVe/T5UAvrr8n7mRqMfye4QtHHOVM3MHvZv93AXVUQU4PH9KPGtv7poEtwNWk
-7hNbq74z5x5tSvE0EYYI9UMolDL6il+QR5AgLw7YqgMmPPhtm+crmLg8+uMoQDyU
-uSH8ej4rMrdhL2xKlgvL/rhWycpYu1cFLmeolljOZGqr7ITwWJ06BQsLtt4/cyYj
-WiVldHQRZMGAuHLHlX+ukaEg7Gc/N7o936bS5d7AqXwtmtkXiA8An5q5rhncEK1G
-kwUUQN2y5iyx/nD4B2k1IcgFlu/bM4iXZQtmMUtLptUqRssuxS45ukiweiM9UU8n
-WxyxJMzFTctJJ2f/y4Bg5ggsr4WQU/YhoDaQVYxyjXiBt3oT+7eqsoep9HK9xwbG
-xriLzrlao+K3EcKA3vjKGYh15gpEDUbn0Cr5V74TUSdkHjhG7ocaJ5u9/vCS4+AR
-iU5ge2zN6QcwoZKT8+8XGKeXqVc/3hXeXTn3FyvMitPDZsmg8wUhnb/pq5MyKqUA
-bNse4a7oGAeAUGkLf4Q+eLCLSZmL5udrGXdHIffFYqZVcZS+zVWQ1TRfodTDPkFb
-KTz1mcr4KjLNCtplu4CfFpHwC20uk3hPEslOUd+ugj0+HGNH93L7H0WL1GDQoCPh
-RcdRISVwORcD/dit15zD
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:Credential>
</security:TrustEngine>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref.xml
index 8bc074df..46081ccf 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref.xml
@@ -9,7 +9,7 @@
xsi:type="metadata:FileBackedHTTPMetadataProvider"
httpClientSecurityParametersRef="metadata.HttpClientSecurityParametersWithTrustEngine"
backingFile="%{DIR}/spoolhttpstrustengineexplicitkeyviaparams.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey.xml
index 73d21da0..1e1e3071 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey.xml
@@ -10,48 +10,37 @@
id="HTTPSEntity"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpstrustengineexplicitkey.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
<security:Credential xsi:type="security:X509Inline" id="shibboleth.net">
<security:Certificate>
-<!-- The projects LLSS cert -->
-MIIGazCCBFOgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwaTELMAkGA1UEBhMCVVMx
-DTALBgNVBAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEr
-MCkGA1UEAwwiU2hpYmJvbGV0aCBQcm9qZWN0IEludGVybWVkaWF0ZSBDQTAeFw0x
-ODEyMTExNTE5NDlaFw0zODEyMDYxNTE5NDlaMFoxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xHDAaBgNV
-BAMME3Rlc3Quc2hpYmJvbGV0aC5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDI39TBFEbOkf0Bb2h/qnG4bbJRF5Ga9OBgSAxPsx2PNgVmf1cvJYlq
-uRCzATu3O4PPclomow5VU7hB+umpk2s03FHejUtO8w85qQx7bkSeyfLpMYloX3SD
-AWDFSpw54Tg2Dfja6jYLnE0aYWUCTXjcFJEIrT0QP1Azdk8b9PeKLqGIagECUMzC
-UjmJxEcyqhbe6mB7tdSsBng+R4DRdVdouN4rtHknNuEyAc5eEppGxY33KXhElYol
-4IK6YxAqXI6iQIDdcVxrH061/iKh7qT1bCAEmzeeoS4st4v4oyIhxUk7yUxYOuFc
-NhYUd5U93Ws4P8xPFzcPhD2TIZDAS/bnm2EJ+JxLG6Gp1jhBN5qTpdTPWiG9+Tmm
-HFuYOrSefgZk0edkJhe0dycfV/FWFX2fNrmkpQhyPQzb3ZyZ5mACn020TXDaF5o3
-fX8ndLl4RghTORJs5n51TuLX85DEeZWkJe5f8Hsip1mpmxlMTl9QMqHrN70n5gBi
-uCYo9g/Jw5xoropCq7Jri9K9FWtbORncUIXutsTVo+fXeHZ6IDRoovR004gHHEJ7
-ks46fZQYNbd8bB/mPlCdYiFyJnfUiOu89O5aLqvhrJNgPUhMt/gmhSV7zw+/3/cd
-o7pwWH2h2ObuS8v8gVUZAE04tefqRJZEB0YsWA3DASDT7nVqndOp2QIDAQABo4IB
-KjCCASYwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwMwYJYIZIAYb4QgEN
-BCYWJE9wZW5TU0wgR2VuZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-FgQUG3Vg4ubsJVaylBUCPtqVc9mHWfYwgYwGA1UdIwSBhDCBgYAUELzfpij2mkrs
-9B4CEsXYmoN6cKuhZaRjMGExCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4w
-HAYDVQQKDBVTaGliYm9sZXRoIENvbnNvcnRpdW0xIzAhBgNVBAMMGlNoaWJib2xl
-dGggUHJvamVjdCBUZXN0IENBggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIBAFZQF7KzKGSPieV2eQWbFt30
-kVZzVe/T5UAvrr8n7mRqMfye4QtHHOVM3MHvZv93AXVUQU4PH9KPGtv7poEtwNWk
-7hNbq74z5x5tSvE0EYYI9UMolDL6il+QR5AgLw7YqgMmPPhtm+crmLg8+uMoQDyU
-uSH8ej4rMrdhL2xKlgvL/rhWycpYu1cFLmeolljOZGqr7ITwWJ06BQsLtt4/cyYj
-WiVldHQRZMGAuHLHlX+ukaEg7Gc/N7o936bS5d7AqXwtmtkXiA8An5q5rhncEK1G
-kwUUQN2y5iyx/nD4B2k1IcgFlu/bM4iXZQtmMUtLptUqRssuxS45ukiweiM9UU8n
-WxyxJMzFTctJJ2f/y4Bg5ggsr4WQU/YhoDaQVYxyjXiBt3oT+7eqsoep9HK9xwbG
-xriLzrlao+K3EcKA3vjKGYh15gpEDUbn0Cr5V74TUSdkHjhG7ocaJ5u9/vCS4+AR
-iU5ge2zN6QcwoZKT8+8XGKeXqVc/3hXeXTn3FyvMitPDZsmg8wUhnb/pq5MyKqUA
-bNse4a7oGAeAUGkLf4Q+eLCLSZmL5udrGXdHIffFYqZVcZS+zVWQ1TRfodTDPkFb
-KTz1mcr4KjLNCtplu4CfFpHwC20uk3hPEslOUd+ugj0+HGNH93L7H0WL1GDQoCPh
-RcdRISVwORcD/dit15zD
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:Credential>
</security:TrustEngine>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidKey.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidKey.xml
index 17128823..a77dc104 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidKey.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidKey.xml
@@ -10,7 +10,7 @@
id="HTTPSEntity"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpstrustengineinvalidkey.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidPKIX.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidPKIX.xml
index bde17a56..8f2226ae 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidPKIX.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-invalidPKIX.xml
@@ -10,7 +10,7 @@
id="HTTPSEntity"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpstrustengineinvalidPKIX.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticPKIXX509Credential" trustedNameCheckEnabled="false">
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml
index f4f69c29..02256bce 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml
@@ -10,45 +10,38 @@
id="HTTPSEntity"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpstrustvalidpkixexplicit.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticPKIXX509Credential">
- <security:TrustedName>test.shibboleth.net</security:TrustedName>
+ <security:TrustedName>localhost</security:TrustedName>
<security:ValidationInfo id="validRoot" xsi:type="security:PKIXInline" verifyDepth="5">
- <!-- The project's own test CA root -->
<security:Certificate>
-MIIFqDCCA5CgAwIBAgIJAIEDdQdu3nBaMA0GCSqGSIb3DQEBCwUAMGExCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNv
-cnRpdW0xIzAhBgNVBAMMGlNoaWJib2xldGggUHJvamVjdCBUZXN0IENBMB4XDTE4
-MTIxMTE0NTQzM1oXDTQ2MDQyODE0NTQzM1owYTELMAkGA1UEBhMCVVMxDTALBgNV
-BAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEjMCEGA1UE
-AwwaU2hpYmJvbGV0aCBQcm9qZWN0IFRlc3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCq4lNY743on4A4/E5dOYCbscXE+lsJtDjd8fyFXmXqYpfi
-1KP6Vh8foWEvG70dEQR4oxxcA1que2HbqIaQtWOT4LJBWTvUNF+dKFiDkTHkzbxx
-FnzJVPXYDzrDz2CbWpAh496S8BsT7+84+TqGGngJs2POFcHhQFAxr7Of9pKwGLXz
-BWCes+FSjst7yLrrrbkB8MXuHD5h+EjK+C552jECqCmgabbThESsMleVqBcjmuoH
-X2BejIghRsw5Y8wGq5hWr92lOD86p+Hn3kC+4yR20XCQu9P+l/ZPlzFkW/FFDPPh
-6U9ZP1Kf1hDkkDQDZLtyy5xLs0ew+4rjxlH4Bmh45zBcDprd8yA6hnoIN4w5IFF+
-w1bZTUPlNvMdf/4EjVIJ8UFfJXTMSD2VPeTd1veb/uaAtToU599u7ITh2gaZGfh3
-AmXUR2gX9+eKbJG4fXHwLxkddl/dSjgbFRPrtBgp/w8DNZICmpJSpdWvmSY/o8ix
-Tq1ZKX8UuzrsBOtG0Y7Fi/aJtrsgD9KqpnGEhBFWJ8zFHHdZIUMKacUJgzFARlsM
-e/eoM49a4oCqFfPeRgriC9eWfFbRIH86RBjuVk8Rs/q35mkpk702eEnf0kdB7E/q
-JE4qgBnEhSONl2ytTt7rsrw19jXCw+FOfHB2KQa50h59wsKF3oaCoG4f5hZC/wID
-AQABo2MwYTAdBgNVHQ4EFgQU6lFKNP6lo4e1TixtvcdR5NVuxfkwHwYDVR0jBBgw
-FoAU6lFKNP6lo4e1TixtvcdR5NVuxfkwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBADt/nRWMaUr396xdtu/UNtzm0dfp
-zyqusqaD09JbqW1mQJ/fH6mZ+yPOYd7h5A47znPe9o0jJlR11GcPvRPTM4IR8aLB
-ogK05TGtWP6sBNR8vld87C5e1hKRwoHDqyLUriK/hpi30zB4B+whW0kty6wqF9lt
-X819emItLgDr1qS6v9iDd9AS4xmpcRxP47YugvlIKBNeiuK+UXhY3lBYg4453Pgn
-Fi78GoOM51oEY1LrCpiXSly4sz25MflM47Cppxh5fAIPoFsqRwmpJ3lETBmLCe6v
-7Shjgc0bEidlAxF8BPoXKvMSkjfBRmmhw6UvJ158NmKWSXV6r6x1ZWG/5N2GKpO4
-1eV7RNV4ojpyc87RJJdpstcFJFVjBzEVZ9EcohG1/UDHITu3e5XPrtgPQZGXKjX5
-EHtO5hDb6xxkblQ6qe1L3Ga+ZfNg1rHIpicYz1yZS5mR0dD1LJrzwyan9s1Ld5IU
-v2YWniDlnFXBFWC+9hRF544aN2M/7Q10J13ZYg7d2YbOnp2XhTV1Ud7T/PN4wxHu
-aTJ+2OEsL2Uy4oQ5bGEfgkG22NVxOpAR5/baAoqwxUxIXmE9ub2jVOPt6AzLeNdr
-RaPULkvHLvGMy+VpAqEIPG1OiROg+tWKRmDhF5PtOTneeHR2yHjjWGO+DDY7sAEu
-JWXY3HAfr1aJ7DVm
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:ValidationInfo>
</security:TrustEngine>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX.xml
index 16e353ca..993969ee 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-validPKIX.xml
@@ -10,44 +10,37 @@
id="HTTPSEntity"
xsi:type="metadata:FileBackedHTTPMetadataProvider"
backingFile="%{DIR}/spoolhttpsvalidpkix.xml"
- metadataURL="%{metadataURL}">
+ metadataURL="https://localhost:8443/entity.xml">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticPKIXX509Credential" trustedNameCheckEnabled="false">
<security:ValidationInfo id="validRoot" xsi:type="security:PKIXInline" verifyDepth="5">
- <!-- The project's own test CA root -->
<security:Certificate>
-MIIFqDCCA5CgAwIBAgIJAIEDdQdu3nBaMA0GCSqGSIb3DQEBCwUAMGExCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQIDARPaGlvMR4wHAYDVQQKDBVTaGliYm9sZXRoIENvbnNv
-cnRpdW0xIzAhBgNVBAMMGlNoaWJib2xldGggUHJvamVjdCBUZXN0IENBMB4XDTE4
-MTIxMTE0NTQzM1oXDTQ2MDQyODE0NTQzM1owYTELMAkGA1UEBhMCVVMxDTALBgNV
-BAgMBE9oaW8xHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1bTEjMCEGA1UE
-AwwaU2hpYmJvbGV0aCBQcm9qZWN0IFRlc3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCq4lNY743on4A4/E5dOYCbscXE+lsJtDjd8fyFXmXqYpfi
-1KP6Vh8foWEvG70dEQR4oxxcA1que2HbqIaQtWOT4LJBWTvUNF+dKFiDkTHkzbxx
-FnzJVPXYDzrDz2CbWpAh496S8BsT7+84+TqGGngJs2POFcHhQFAxr7Of9pKwGLXz
-BWCes+FSjst7yLrrrbkB8MXuHD5h+EjK+C552jECqCmgabbThESsMleVqBcjmuoH
-X2BejIghRsw5Y8wGq5hWr92lOD86p+Hn3kC+4yR20XCQu9P+l/ZPlzFkW/FFDPPh
-6U9ZP1Kf1hDkkDQDZLtyy5xLs0ew+4rjxlH4Bmh45zBcDprd8yA6hnoIN4w5IFF+
-w1bZTUPlNvMdf/4EjVIJ8UFfJXTMSD2VPeTd1veb/uaAtToU599u7ITh2gaZGfh3
-AmXUR2gX9+eKbJG4fXHwLxkddl/dSjgbFRPrtBgp/w8DNZICmpJSpdWvmSY/o8ix
-Tq1ZKX8UuzrsBOtG0Y7Fi/aJtrsgD9KqpnGEhBFWJ8zFHHdZIUMKacUJgzFARlsM
-e/eoM49a4oCqFfPeRgriC9eWfFbRIH86RBjuVk8Rs/q35mkpk702eEnf0kdB7E/q
-JE4qgBnEhSONl2ytTt7rsrw19jXCw+FOfHB2KQa50h59wsKF3oaCoG4f5hZC/wID
-AQABo2MwYTAdBgNVHQ4EFgQU6lFKNP6lo4e1TixtvcdR5NVuxfkwHwYDVR0jBBgw
-FoAU6lFKNP6lo4e1TixtvcdR5NVuxfkwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBADt/nRWMaUr396xdtu/UNtzm0dfp
-zyqusqaD09JbqW1mQJ/fH6mZ+yPOYd7h5A47znPe9o0jJlR11GcPvRPTM4IR8aLB
-ogK05TGtWP6sBNR8vld87C5e1hKRwoHDqyLUriK/hpi30zB4B+whW0kty6wqF9lt
-X819emItLgDr1qS6v9iDd9AS4xmpcRxP47YugvlIKBNeiuK+UXhY3lBYg4453Pgn
-Fi78GoOM51oEY1LrCpiXSly4sz25MflM47Cppxh5fAIPoFsqRwmpJ3lETBmLCe6v
-7Shjgc0bEidlAxF8BPoXKvMSkjfBRmmhw6UvJ158NmKWSXV6r6x1ZWG/5N2GKpO4
-1eV7RNV4ojpyc87RJJdpstcFJFVjBzEVZ9EcohG1/UDHITu3e5XPrtgPQZGXKjX5
-EHtO5hDb6xxkblQ6qe1L3Ga+ZfNg1rHIpicYz1yZS5mR0dD1LJrzwyan9s1Ld5IU
-v2YWniDlnFXBFWC+9hRF544aN2M/7Q10J13ZYg7d2YbOnp2XhTV1Ud7T/PN4wxHu
-aTJ+2OEsL2Uy4oQ5bGEfgkG22NVxOpAR5/baAoqwxUxIXmE9ub2jVOPt6AzLeNdr
-RaPULkvHLvGMy+VpAqEIPG1OiROg+tWKRmDhF5PtOTneeHR2yHjjWGO+DDY7sAEu
-JWXY3HAfr1aJ7DVm
+<!-- The projects Embedded Jetty cert -->
+MIIEZTCCAs2gAwIBAgIUaOqLVUXbNQuPp+JzeFZaC4v/Po0wDQYJKoZIhvcNAQEL
+BQAwQTELMAkGA1UEBhMCVVMxHjAcBgNVBAoMFVNoaWJib2xldGggQ29uc29ydGl1
+bTESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIyMDkwODE0MDkyNFoYDzIwNzcwNjEx
+MTQwOTI0WjBBMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVU2hpYmJvbGV0aCBDb25z
+b3J0aXVtMRIwEAYDVQQDDAlsb2NhbGhvc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IB
+jwAwggGKAoIBgQCnIstvkXhPD0RYkl9Z01FwoO11uGf/+OaXyI5krFahD+277Qpb
+SCIqgbvMVTI5zPdya1ukLTEjvB8f0ytpXSZ1sH5dB5ur7YwAE1cHsFg6MvMAztSv
+qcVZrOYjGZFUNzS22UVk1zkdm6do+FKVDfMCRyy/soQQidKkFESHERbDJ3rRk9XQ
+HMG0cVnfnohILYmiar9TosEwO1EEa0vaBeK6ctdRW3OOW401yfQy31gQqxKmsX+n
+DPdDznUy/yxe/ZtRWyiMbTgtASmjYgFSipt9zcpQi0Igwb77sLDXc0GI3vuyCQfh
+q1V54puv+5yNq2J1khh3pMRWkHYDMJIJA40K9sR5cjdCuo0i0JgV+syMedV96xSw
+LPKY4bUF80pfRZlhv/0dAiJVSoMkn6vYKTq4/iGYEI0KFhWs9UdZXgyWQJAGaAuc
++vXQ88On7A24SBaBZFGvQ8NtXsFL9EjPelSDbuqH5F+8SFjD9v3EC3K9H83/78Hm
+r8kGwmMUnNr3M/0CAwEAAaNTMFEwHQYDVR0OBBYEFEgRz075hrhEAzUUGknaE65f
+1ZQBMB8GA1UdIwQYMBaAFEgRz075hrhEAzUUGknaE65f1ZQBMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggGBADZ3aT8thtt42ldx8mKbMKnHooycPUf5
+QY0y4/GSOu5AFhbLPyQFPGCNr5RLKYEvUZzJssnuIKjg/VK8a19BdS9UiV5n6vFu
+75gUHuBW8cOjl16XUorMO+IFD+1bHO7jBu8ZHqrqOxzhDyHH2MqwI/zFi/wzjzh4
+q39fo3F05A6gyaA2DOz9dhyDeg8tlMIlgkgBqe8OwiqvuKUFZmog4wt44X297B5N
+9fI7xRFpoD1i7uhsJW7byewmNXQb5HJXAit/U7iOY+1J4ZSYtkwm3BVA1fhnY4Ys
+d+ex553wVS3RyfrEoLth3E8f9vksLVdWSaDjaWnY49B/NX6kMVWQd8CzoOJDYK+P
+uOGv8s6IN1qCNdDE0B9QHIMpkGP7y0kWKNbYoSKgRTSHJA/viARFOe3UKRpHie2u
+dJ2siyveIgSpflsUJ0acmzkrJdBEdXj7QoWeIosSOtxvkwSvfRjDaiBCbr3SGvxj
+jpv4MN2X1UTUAOhOi5c+Vw5zQ32xX1cC8A==
</security:Certificate>
</security:ValidationInfo>
</security:TrustEngine>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list